From ea95bdeb62a44d12faee0a6fcabc121d45b9b0b8 Mon Sep 17 00:00:00 2001
From: Christopher Vogt <oss.nsp@cvogt.org>
Date: Sat, 12 Mar 2016 19:27:57 -0500
Subject: Always reset security manager to what it was during startup. Should
 be less fragile with regards to concurrency and user code setting security
 managers.

---
 nailgun_launcher/NailgunLauncher.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'nailgun_launcher/NailgunLauncher.java')

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,
-- 
cgit v1.2.3