diff --git a/src/changes/changes.xml b/src/changes/changes.xml index f81e395111..3790677126 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -8,6 +8,9 @@ + + NPE in org.htmlunit.javascript.JavaScriptEngine.asJavaScriptException(). + Upgrade commons-logging to 1.3.5. diff --git a/src/main/java/org/htmlunit/javascript/JavaScriptEngine.java b/src/main/java/org/htmlunit/javascript/JavaScriptEngine.java index 8dd1b085aa..733f6bb4df 100644 --- a/src/main/java/org/htmlunit/javascript/JavaScriptEngine.java +++ b/src/main/java/org/htmlunit/javascript/JavaScriptEngine.java @@ -1213,7 +1213,10 @@ public static RhinoException asJavaScriptException(final HtmlUnitScriptable scop domException.setPrototype(scope.getPrototype(DOMException.class)); final EcmaError helper = ScriptRuntime.syntaxError("helper"); - final String fileName = helper.sourceName().replaceFirst("script in (.*) from .*", "$1"); + String fileName = helper.sourceName(); + if (fileName != null) { + fileName = fileName.replaceFirst("script in (.*) from .*", "$1"); + } domException.setLocation(fileName, helper.lineNumber()); return new JavaScriptException(domException, fileName, helper.lineNumber());