diff options
| author | Thomas Watson | 2012-03-15 17:34:21 +0000 |
|---|---|---|
| committer | Thomas Watson | 2012-04-03 17:49:48 +0000 |
| commit | 7b33d2424dedfdc625d623e853bf84784e9a5678 (patch) | |
| tree | fe12879b2513c14fef58f050074141c8358dca01 | |
| parent | d7908eb7405c8fe8363bb937152ee9a8e7866040 (diff) | |
| download | rt.equinox.framework-R3_6_1_patches.tar.gz rt.equinox.framework-R3_6_1_patches.tar.xz rt.equinox.framework-R3_6_1_patches.zip | |
Bug 374300 - Should protect against adding vm shutdown hooks when the VM is in the process of being shutdownR3_6_1_patches
| -rw-r--r-- | bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java index 5d197d583..2da9898c1 100644 --- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java +++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java @@ -1284,7 +1284,11 @@ public class BaseStorage implements SynchronousBundleListener { }); runningThread = new Thread(this, "State Saver"); //$NON-NLS-1$ runningThread.start(); - Runtime.getRuntime().addShutdownHook(shutdownHook); + try { + Runtime.getRuntime().addShutdownHook(shutdownHook); + } catch (IllegalStateException e) { + // bug 374300 - need to ignore this in case the VM is being shutdown + } } } } |