Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDJ Houghton2011-02-03 21:27:30 +0000
committerDJ Houghton2011-02-03 21:27:30 +0000
commit59a31c74eaaf161ae436061a56cd88e6cd1fdc26 (patch)
tree32422f71466ace2c81b2c34b68bb05c4ab0d4d97 /bundles/org.eclipse.equinox.frameworkadmin.equinox
parent9f983fce5962c19613b99b9afe9b7468cf80d25b (diff)
downloadrt.equinox.p2-59a31c74eaaf161ae436061a56cd88e6cd1fdc26.tar.gz
rt.equinox.p2-59a31c74eaaf161ae436061a56cd88e6cd1fdc26.tar.xz
rt.equinox.p2-59a31c74eaaf161ae436061a56cd88e6cd1fdc26.zip
Bug 329583 - [shared] osgi.framework is written in both shared and user config.ini
Diffstat (limited to 'bundles/org.eclipse.equinox.frameworkadmin.equinox')
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.equinox/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxFwConfigFileParser.java9
2 files changed, 9 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.frameworkadmin.equinox/META-INF/MANIFEST.MF
index 07e9fa750..973cd3251 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.frameworkadmin.equinox;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.300.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Import-Package: org.eclipse.core.runtime.internal.adaptor,
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxFwConfigFileParser.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxFwConfigFileParser.java
index a96127ed7..6186e7d48 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxFwConfigFileParser.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxFwConfigFileParser.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2010 IBM Corporation and others.
+ * Copyright (c) 2007, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -513,6 +513,13 @@ public class EquinoxFwConfigFileParser {
continue;
}
+ // never write out the osgi.framework property in the user's local config.ini
+ // See https://bugs.eclipse.org/329583
+ if (key.equals(EquinoxConstants.PROP_OSGI_FW)) {
+ configProps.remove(key);
+ continue;
+ }
+
if (key.equals(EquinoxConstants.PROP_BUNDLES) && equalBundleLists(manipulator, value, sharedValue)) {
configProps.remove(key);
continue;

Back to the top