Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2012-03-15 17:34:21 +0000
committerThomas Watson2012-03-15 17:34:21 +0000
commit6d454bdd922374d0757ba4aacc60f096b4a75db4 (patch)
tree435164d48e11d45acfbc3f746a746bdc4abe9c3f
parentab0400d0839454ce89348cb734c0a7cdfeead48c (diff)
downloadrt.equinox.framework-6d454bdd922374d0757ba4aacc60f096b4a75db4.tar.gz
rt.equinox.framework-6d454bdd922374d0757ba4aacc60f096b4a75db4.tar.xz
rt.equinox.framework-6d454bdd922374d0757ba4aacc60f096b4a75db4.zip
-rw-r--r--bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java6
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
+ }
}
}
}

Back to the top