Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java
index 7f1bdef81..6fa984613 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java
@@ -189,7 +189,7 @@ public class SystemBundleActivator implements BundleActivator {
}
private void unintallSecurityManager() {
- if (System.getSecurityManager() == setSecurityManagner)
+ if (setSecurityManagner != null && System.getSecurityManager() == setSecurityManagner)
System.setSecurityManager(null);
setSecurityManagner = null;
}

Back to the top