Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2019-01-03 12:21:26 -0500
committerThomas Watson2019-01-03 12:21:26 -0500
commit821b16116174794481870a0cbb239b59bbd4cd13 (patch)
tree26755b158497ba6484ab9c43554382b8aeb1a0c8
parente71a10af60b07f92d918a5c103fa27331d9a3ddc (diff)
downloadrt.equinox.framework-I20190103-1800.tar.gz
rt.equinox.framework-I20190103-1800.tar.xz
rt.equinox.framework-I20190103-1800.zip
framework property Change-Id: Ie4ad30bc1d332f851bdd0e3a89cbe270a296b651 Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java24
1 files changed, 14 insertions, 10 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java
index 22e1b251d..dd8b559d6 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2017 IBM Corporation and others.
+ * Copyright (c) 2003, 2019 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -239,6 +239,8 @@ public class EquinoxConfiguration implements EnvironmentInfo {
public static final String PROP_ACTIVE_THREAD_TYPE = "osgi.framework.activeThreadType"; //$NON-NLS-1$
public static final String ACTIVE_THREAD_TYPE_NORMAL = "normal"; //$NON-NLS-1$
+ public static final String PROP_GOSH_ARGS = "gosh.args"; //$NON-NLS-1$
+
public static final class ConfigValues {
/**
* Value of {@link #localConfig} properties that should be considered
@@ -320,15 +322,17 @@ public class EquinoxConfiguration implements EnvironmentInfo {
setConfiguration(PROP_STATE_SAVE_DELAY_INTERVAL, DEFAULT_STATE_SAVE_DELAY_INTERVAL);
}
- String consoleProp = getConfiguration(ConsoleManager.PROP_CONSOLE);
- consoleProp = consoleProp == null ? null : consoleProp.trim();
- if (consoleProp == null || consoleProp.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
- setConfiguration("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)
- setConfiguration("gosh.args", "--noshutdown"); //$NON-NLS-1$//$NON-NLS-2$
+ if (getConfiguration(PROP_GOSH_ARGS) == null) {
+ String consoleProp = getConfiguration(ConsoleManager.PROP_CONSOLE);
+ consoleProp = consoleProp == null ? null : consoleProp.trim();
+ if (consoleProp == null || consoleProp.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
+ setConfiguration(PROP_GOSH_ARGS, "--nointeractive"); //$NON-NLS-1$
+ } else {
+ // Need to make sure we don't shutdown the framework if no console is around (bug 362412)
+ setConfiguration(PROP_GOSH_ARGS, "--noshutdown"); //$NON-NLS-1$
+ }
}
}

Back to the top