Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2014-09-08 18:09:14 +0000
committerThomas Watson2014-09-09 16:32:47 +0000
commit426e46d270ffe048509f2a57127ad9ae4ac27828 (patch)
treec68ae632b00f234e21fd09d9d7ad8a5be56acf78
parent88e0c74ea37359695f53c6009d38048323eb9350 (diff)
downloadrt.equinox.framework-426e46d270ffe048509f2a57127ad9ae4ac27828.tar.gz
rt.equinox.framework-426e46d270ffe048509f2a57127ad9ae4ac27828.tar.xz
rt.equinox.framework-426e46d270ffe048509f2a57127ad9ae4ac27828.zip
Bug 443340 - Fix to set osgi.checkConfiguration if osgi.dev is set
Change-Id: Iae75f4c0be9d916fbae1ffe5cbe0aee934ab0026 Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java4
1 files changed, 4 insertions, 0 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 159887491..52a4d4a7c 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
@@ -283,6 +283,10 @@ public class EquinoxConfiguration implements EnvironmentInfo {
// A specified osgi.dev property but unspecified osgi.checkConfiguration
// property implies osgi.checkConfiguration = true.
inCheckConfigurationMode = Boolean.valueOf(getConfiguration(PROP_CHECK_CONFIGURATION, Boolean.toString(devMode)));
+ // Must ensure the check configuration property is set if in osgi.dev mode (bug 443340)
+ if (inCheckConfigurationMode && getConfiguration(PROP_CHECK_CONFIGURATION) == null) {
+ setConfiguration(PROP_CHECK_CONFIGURATION, "true"); //$NON-NLS-1$
+ }
}
public Map<String, Object> getInitialConfig() {

Back to the top