Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2011-10-31 09:58:22 -0400
committerThomas Watson2011-10-31 16:05:21 -0400
commitce9ce834452337419becbdc1f895b70a34ea2c5c (patch)
tree0f8d18630ea4a1992df65ba1d8d4109ba03599c3
parentf28739af35ffac2f8a08e37ba74387946b3f0b48 (diff)
downloadrt.equinox.framework-ce9ce834452337419becbdc1f895b70a34ea2c5c.tar.gz
rt.equinox.framework-ce9ce834452337419becbdc1f895b70a34ea2c5c.tar.xz
rt.equinox.framework-ce9ce834452337419becbdc1f895b70a34ea2c5c.zip
Bug 362412 - [console] can't launch M3 eclipse without a terminalv20111031-1612
-rw-r--r--bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/ConsoleManager.java14
1 files changed, 8 insertions, 6 deletions
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 97085a49a..ecb88c91d 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
@@ -119,6 +119,14 @@ public class ConsoleManager implements ServiceTrackerCustomizer<ConsoleSession,
this.cpTracker = null;
this.sessions = null;
this.consoleBundle = "false".equals(enabled) ? CONSOLE_BUNDLE : enabled; //$NON-NLS-1$
+ if (consolePort == null || consolePort.length() > 0) {
+ // no -console was specified or it has specified none or a port for telnet;
+ // need to make sure the gogo shell does not create an interactive console on standard in/out
+ FrameworkProperties.setProperty("gosh.args", "--nointeractive"); //$NON-NLS-1$//$NON-NLS-2$
+ } else {
+ // Need to make sure we don't shutdown the framework if no console is around (bug 362412)
+ FrameworkProperties.setProperty("gosh.args", "--noshutdown"); //$NON-NLS-1$//$NON-NLS-2$
+ }
return;
}
this.isEnabled = true;
@@ -197,12 +205,6 @@ public class ConsoleManager implements ServiceTrackerCustomizer<ConsoleSession,
if ("none".equals(consolePort)) //$NON-NLS-1$
return;
// otherwise we need to check for the equinox console bundle and start it
- if (consolePort == null || consolePort.length() > 0) {
- // no -console was specified or it has specified none or a port for telnet;
- // need to make sure the gogo shell does not create an interactive console on standard in/out
- FrameworkProperties.setProperty("gosh.args", "--nointeractive"); //$NON-NLS-1$//$NON-NLS-2$
- }
-
Bundle[] consoles = framework.getBundleBySymbolicName(consoleBundle);
if (consoles == null || consoles.length == 0) {
if (consolePort != null)

Back to the top