Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2010-06-28 10:11:50 -0400
committerThomas Watson2010-06-28 10:11:50 -0400
commiteb1c04fad22c8d26b973dbb3016013cfec42b90f (patch)
tree25ba3e882026109fdbfd413fc920fe2f0872833a /bundles/org.eclipse.osgi
parent095cc2f0552d415e09b4105e68369da4d8344bc7 (diff)
downloadrt.equinox.framework-eb1c04fad22c8d26b973dbb3016013cfec42b90f.tar.gz
rt.equinox.framework-eb1c04fad22c8d26b973dbb3016013cfec42b90f.tar.xz
rt.equinox.framework-eb1c04fad22c8d26b973dbb3016013cfec42b90f.zip
Bug 314343 - [console] IllegalStateException can happen on shutdown if you disconnect from standard consoleR36x_v20100628
Diffstat (limited to 'bundles/org.eclipse.osgi')
-rw-r--r--bundles/org.eclipse.osgi/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/ConsoleManager.java6
2 files changed, 6 insertions, 2 deletions
diff --git a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
index eab6b1132..68e239d49 100644
--- a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
@@ -68,7 +68,7 @@ Bundle-Activator: org.eclipse.osgi.framework.internal.core.SystemBundleActivator
Bundle-Description: %systemBundle
Bundle-Copyright: %copyright
Bundle-Vendor: %eclipse.org
-Bundle-Version: 3.6.0.qualifier
+Bundle-Version: 3.6.1.qualifier
Bundle-Localization: systembundle
Bundle-DocUrl: http://www.eclipse.org
Eclipse-ExtensibleAPI: true
diff --git a/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/ConsoleManager.java b/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/ConsoleManager.java
index 5f2028e63..5fa9dfa4d 100644
--- a/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/ConsoleManager.java
+++ b/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/ConsoleManager.java
@@ -159,7 +159,11 @@ public class ConsoleManager implements ServiceTrackerCustomizer {
*/
public void stopConsole() {
if (builtinSession != null)
- builtinSession.unregister();
+ try {
+ builtinSession.unregister();
+ } catch (IllegalStateException e) {
+ // ignore; this can happen if the session was closed manually (bug 314343)
+ }
sessions.close();
cpTracker.close();
if (scsg != null)

Back to the top