diff options
author | Thomas Watson | 2014-03-26 14:38:19 +0000 |
---|---|---|
committer | Thomas Watson | 2014-03-26 14:49:38 +0000 |
commit | 2b1481de1ca1fb377e40a7f6815415470c8a4bfd (patch) | |
tree | 405c6e33b906f590b287ddae14ab3ef7d1e6b25b /bundles/org.eclipse.equinox.launcher | |
parent | 4527b77cfd9a61c2a8469bb3b49ee27bfa6c90f0 (diff) | |
download | rt.equinox.framework-2b1481de1ca1fb377e40a7f6815415470c8a4bfd.tar.gz rt.equinox.framework-2b1481de1ca1fb377e40a7f6815415470c8a4bfd.tar.xz rt.equinox.framework-2b1481de1ca1fb377e40a7f6815415470c8a4bfd.zip |
Bug 430798 - Inability to distinguish and investigate an Equinox restartI20140401-1500I20140401-0800
request when using -noExit
Diffstat (limited to 'bundles/org.eclipse.equinox.launcher')
-rw-r--r-- | bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java index 8a299c468..d9e8f3a08 100644 --- a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java +++ b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java @@ -1441,7 +1441,10 @@ public class Main { // In case something weird happens, just dump stack - logging is not available at this point t.printStackTrace(); } finally { - if (!Boolean.getBoolean(PROP_NOSHUTDOWN)) + // If the return code is 23, that means that Equinox requested a restart. + // In order to distinguish the request for a restart, do a System.exit(23) + // no matter of 'osgi.noShutdown' runtime property value. + if (!Boolean.getBoolean(PROP_NOSHUTDOWN) || result == 23) // make sure we always terminate the VM System.exit(result); } |