| commit | 478008b1327abe05d8a2b0eb43123f844e9f7643 | [log] [tgz] |
|---|---|---|
| author | DJ Houghton <dj> | Thu Sep 15 18:54:08 2005 +0000 |
| committer | DJ Houghton <dj> | Thu Sep 15 18:54:08 2005 +0000 |
| tree | 19cf5d96145559ad57006e074fcb9ed082a872c5 | |
| parent | 9dc76275a039c36258aa45851f47aa12dfdebd8d [diff] |
Bug 86750 - [prefs] Preferences are not reloaded
diff --git a/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF index 484b5cc..d0e458a 100644 --- a/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-Version: 3.1.0 +Bundle-Version: 3.1.1 Bundle-SymbolicName: org.eclipse.core.runtime; singleton:=true Bundle-Vendor: %providerName Bundle-Activator: org.eclipse.core.internal.runtime.PlatformActivator
diff --git a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/InstancePreferences.java b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/InstancePreferences.java index d0d58ea..e0c0ee4 100644 --- a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/InstancePreferences.java +++ b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/InstancePreferences.java
@@ -40,7 +40,7 @@ // to disk when #flush() is called. if (baseLocation == null) { Location instanceLocation = Platform.getInstanceLocation(); - if (instanceLocation != null && instanceLocation.isSet()) + if (instanceLocation != null && (instanceLocation.isSet() || instanceLocation.allowsDefault())) baseLocation = InternalPlatform.getDefault().getMetaArea().getStateLocation(Platform.PI_RUNTIME); } return baseLocation;