diff options
author | Thomas Watson | 2012-03-15 17:34:21 +0000 |
---|---|---|
committer | Thomas Watson | 2012-03-15 17:34:21 +0000 |
commit | 6d454bdd922374d0757ba4aacc60f096b4a75db4 (patch) | |
tree | 435164d48e11d45acfbc3f746a746bdc4abe9c3f | |
parent | ab0400d0839454ce89348cb734c0a7cdfeead48c (diff) | |
download | rt.equinox.framework-I20120408-0246.tar.gz rt.equinox.framework-I20120408-0246.tar.xz rt.equinox.framework-I20120408-0246.zip |
Bug 374300 - Should protect against adding vm shutdown hooks when the VM is in the process of being shutdownv20120315-1734N20120416-1918I20120417-0800I20120417-0334I20120417-0255I20120417-0235I20120417-0211I20120417-0142I20120416-2327I20120416-1738I20120416-1719I20120416-1643I20120416-1623I20120416-1600I20120416-1508I20120411-2034I20120411-1737I20120411-0906I20120411-0258I20120410-2330I20120410-2037I20120410-1710I20120410-0633I20120410-0320I20120410-0304I20120410-0252I20120410-0238I20120410-0216I20120410-0152I20120410-0136I20120410-0122I20120410-0102I20120410-0049I20120410-0027I20120409-2358I20120409-2119I20120409-2018I20120409-1957I20120409-1911I20120409-1708I20120409-1622I20120409-1353I20120409-0926I20120409-0904I20120409-0315I20120409-0131I20120408-2304I20120408-2000I20120408-1521I20120408-1324I20120408-1214I20120408-1110I20120408-0330I20120408-0246I20120408-0231I20120408-0216I20120408-0152I20120408-0036I20120408-0012I20120407-2339I20120407-2245I20120407-2106I20120407-1941I20120407-1904I20120407-1840I20120407-1826I20120407-1732I20120407-1717I20120407-1631I20120407-0358I20120407-0346I20120407-0329I20120407-0305I20120407-0217I20120407-0205I20120407-0138I20120407-0103I20120407-0040I20120407-0024I20120406-2327I20120406-0935I20120406-0915I20120406-0250I20120406-0231I20120406-0006I20120405-2131I20120405-1735I20120405-1114I20120405-0114I20120404-2228I20120404-2006I20120404-1351I20120404-0051I20120403-2231I20120328-2028I20120328-2020I20120328-2007I20120328-1956
-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 b165bfe85..cd6845667 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 @@ 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 + } } } } |