From 6671d2c38d45e69fe92f12d319e5b01740ffec8b Mon Sep 17 00:00:00 2001 From: Athijegannathan Sundararajan Date: Mon, 19 Oct 2015 15:49:21 +0530 Subject: [PATCH] 8139852: jjs interactive mode fails to work with security manager Reviewed-by: attila, hannesw --- .../share/classes/jdk/nashorn/tools/jjs/PackagesHelper.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/PackagesHelper.java b/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/PackagesHelper.java index 57b7440e6e5..a726edc7063 100644 --- a/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/PackagesHelper.java +++ b/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/PackagesHelper.java @@ -51,7 +51,11 @@ import javax.tools.ToolProvider; */ final class PackagesHelper { // JavaCompiler may be null on certain platforms (eg. JRE) - private static final JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); + private static final JavaCompiler compiler; + static { + // Use javac only if security manager is not around! + compiler = System.getSecurityManager() == null? ToolProvider.getSystemJavaCompiler() : null; + } /** * Is Java package properties helper available?