diff options
author | Szymon Ptaszkiewicz | 2012-12-21 21:44:06 +0000 |
---|---|---|
committer | John Arthorne | 2012-12-21 21:48:49 +0000 |
commit | 19d6f419af8e26620ef478378218c189427d16c8 (patch) | |
tree | 482bf4dec527d7caba16bda232ed2048e77453f3 /bundles | |
parent | 82a75ae3af29a05d56d9e9d86a13a24866147261 (diff) | |
download | rt.equinox.bundles-19d6f419af8e26620ef478378218c189427d16c8.tar.gz rt.equinox.bundles-19d6f419af8e26620ef478378218c189427d16c8.tar.xz rt.equinox.bundles-19d6f419af8e26620ef478378218c189427d16c8.zip |
Bug 387898 - Wrong preference node created when startingv20121221-214849I20130101-0800I20121225-1600I20121225-0800
org.eclipse.jdt.debug.ui plugin
Diffstat (limited to 'bundles')
3 files changed, 11 insertions, 9 deletions
diff --git a/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF index 2d704ff56..a626155d5 100644 --- a/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.preferences; singleton:=true -Bundle-Version: 3.5.0.qualifier +Bundle-Version: 3.5.100.qualifier Bundle-Activator: org.eclipse.core.internal.preferences.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.equinox.preferences/pom.xml b/bundles/org.eclipse.equinox.preferences/pom.xml index e5c2c80b8..d2806b110 100644 --- a/bundles/org.eclipse.equinox.preferences/pom.xml +++ b/bundles/org.eclipse.equinox.preferences/pom.xml @@ -22,6 +22,6 @@ </parent> <groupId>org.eclipse.equinox.bundles</groupId> <artifactId>org.eclipse.equinox.preferences</artifactId> - <version>3.5.0-SNAPSHOT</version> + <version>3.5.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PreferencesService.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PreferencesService.java index f6bc34cf1..0c66b2a01 100644 --- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PreferencesService.java +++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PreferencesService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2011 IBM Corporation and others. + * Copyright (c) 2004, 2012 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 @@ -613,19 +613,21 @@ public class PreferencesService implements IPreferencesService { Preferences node = context.getNode(qualifier); if (node != null) { found = true; - if (childPath != null) + if (childPath != null && node.nodeExists(childPath)) node = node.node(childPath); result.add(node); } } } if (!found) { - Preferences node = getRootNode().node(scopeString).node(qualifier); - if (childPath != null) - node = node.node(childPath); - result.add(node); + Preferences node = getRootNode().node(scopeString); + if (node.nodeExists(qualifier)) { + node = node.node(qualifier); + if (childPath != null && node.nodeExists(childPath)) + node = node.node(childPath); + result.add(node); + } } - found = false; } public void handleException(Throwable exception) { |