| commit | 6d454bdd922374d0757ba4aacc60f096b4a75db4 | [log] [tgz] |
|---|---|---|
| author | Thomas Watson <tjwatson@us.ibm.com> | Thu Mar 15 12:34:21 2012 -0500 |
| committer | Thomas Watson <tjwatson@us.ibm.com> | Thu Mar 15 12:34:21 2012 -0500 |
| tree | 435164d48e11d45acfbc3f746a746bdc4abe9c3f | |
| parent | ab0400d0839454ce89348cb734c0a7cdfeead48c [diff] |
Bug 374300 - Should protect against adding vm shutdown hooks when the VM is in the process of being shutdown
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 b165bfe..cd68456 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
@@ -1361,7 +1361,11 @@ }); 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 + } } } }