diff options
Diffstat (limited to 'src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java')
-rw-r--r-- | src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java b/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java index c1005415..beb0c2a0 100644 --- a/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java +++ b/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java @@ -30,6 +30,7 @@ import java.util.Collections; import java.util.List; import javax.script.ScriptEngine; import javax.script.ScriptEngineFactory; +import jdk.nashorn.internal.runtime.Context; import jdk.nashorn.internal.runtime.Version; /** @@ -136,7 +137,14 @@ public final class NashornScriptEngineFactory implements ScriptEngineFactory { @Override public ScriptEngine getScriptEngine() { - return new NashornScriptEngine(this, getAppClassLoader()); + try { + return new NashornScriptEngine(this, getAppClassLoader()); + } catch (final RuntimeException e) { + if (Context.DEBUG) { + e.printStackTrace(); + } + throw e; + } } /** @@ -178,7 +186,7 @@ public final class NashornScriptEngineFactory implements ScriptEngineFactory { private static void checkConfigPermission() { final SecurityManager sm = System.getSecurityManager(); if (sm != null) { - sm.checkPermission(new RuntimePermission("nashorn.setConfig")); + sm.checkPermission(new RuntimePermission(Context.NASHORN_SET_CONFIG)); } } |