Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2012-03-15 14:59:06 -0400
committerThomas Watson2012-03-15 14:59:06 -0400
commit3236f5e94c975a9d29459692d7e61652ee6268e4 (patch)
tree985f2e42da6fc8ea64f2ccafac905f77af020035
parent08eef7fc562968530312ced2d25b4937718b5451 (diff)
parent17a98f4def298e1a254c1c07c7f22ea088dbc08b (diff)
downloadrt.equinox.framework-3236f5e94c975a9d29459692d7e61652ee6268e4.tar.gz
rt.equinox.framework-3236f5e94c975a9d29459692d7e61652ee6268e4.tar.xz
rt.equinox.framework-3236f5e94c975a9d29459692d7e61652ee6268e4.zip
Merge branch 'R3_6_maintenance' into R3_6_maintenance_Java7R36x_v20120315-1500
-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 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
+ }
}
}
}

Back to the top