diff options
| author | Thomas Watson | 2013-08-27 15:45:01 +0000 |
|---|---|---|
| committer | Thomas Watson | 2013-08-27 15:45:01 +0000 |
| commit | 79653340f4fe73759a673da9eedc9adb287ecc1c (patch) | |
| tree | 98263afcb371ce2fe641cef2766b885504ae68bf /bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java | |
| parent | 97f78f8fd94eaa1d687864df002122f314284e65 (diff) | |
| download | rt.equinox.framework-79653340f4fe73759a673da9eedc9adb287ecc1c.tar.gz rt.equinox.framework-79653340f4fe73759a673da9eedc9adb287ecc1c.tar.xz rt.equinox.framework-79653340f4fe73759a673da9eedc9adb287ecc1c.zip | |
Bug 415951 - NPE in System.setSecurityManager
Diffstat (limited to 'bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java')
| -rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java | 2 |
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; } |