diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/JavaScriptException.java b/mozilla/js/rhino/src/org/mozilla/javascript/JavaScriptException.java index 99d696e7951..9144b681e8d 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/JavaScriptException.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/JavaScriptException.java @@ -76,18 +76,21 @@ public class JavaScriptException extends RhinoException @Override public String details() { - try { - return ScriptRuntime.toString(value); - } catch (RuntimeException rte) { - // ScriptRuntime.toString may throw a RuntimeException - if (value == null) { - return "null"; - } else if (value instanceof Scriptable) { - return ScriptRuntime.defaultObjectToString((Scriptable)value); - } else { - return value.toString(); - } - } + if (value == null) { + return "null"; + } else if (value instanceof NativeError) { + return value.toString(); + } + try { + return ScriptRuntime.toString(value); + } catch (RuntimeException rte) { + // ScriptRuntime.toString may throw a RuntimeException + if (value instanceof Scriptable) { + return ScriptRuntime.defaultObjectToString((Scriptable)value); + } else { + return value.toString(); + } + } } /**