Always reset security manager to what it was during startup. Should be less fragile with regards to concurrency and user code setting security managers.

2 files changed, 3 insertions, 2 deletions

diff --git a/nailgun_launcher/NailgunLauncher.java b/nailgun_launcher/NailgunLauncher.java
index 78da041..11a8680 100644
--- a/nailgun_launcher/NailgunLauncher.java
+++ b/nailgun_launcher/NailgunLauncher.java
@@ -24,6 +24,8 @@ public class NailgunLauncher{
   public static ConcurrentHashMap<String,ClassLoader> classLoaderCache =
     new ConcurrentHashMap<String,ClassLoader>();
 
+  public static SecurityManager defaultSecurityManager = System.getSecurityManager();
+
   public static void main(String[] args) throws ClassNotFoundException,
                                                 NoSuchMethodException,
                                                 IllegalAccessException,
diff --git a/stage1/Stage1Lib.scala b/stage1/Stage1Lib.scala
index 4af486c..9a1adb5 100644
--- a/stage1/Stage1Lib.scala
+++ b/stage1/Stage1Lib.scala
@@ -217,7 +217,6 @@ class Stage1Lib( val logger: Logger ) extends BaseLib{
   }
 
   def trapExitCode( code: => Unit ): ExitCode = {
-    val old: Option[SecurityManager] = Option(System.getSecurityManager())
     try{
       System.setSecurityManager( trapSecurityManager )
       code
@@ -226,7 +225,7 @@ class Stage1Lib( val logger: Logger ) extends BaseLib{
       case TrappedExitCode(exitCode) =>
         exitCode
     } finally {
-      System.setSecurityManager(old.getOrElse(null))
+      System.setSecurityManager(NailgunLauncher.defaultSecurityManager)
     }
   }
 }