diff options
author | John Arthorne | 2012-07-04 18:53:39 +0000 |
---|---|---|
committer | John Arthorne | 2012-07-04 18:53:39 +0000 |
commit | d434dc1c887cd05b0f7326ca20b2aa721b915028 (patch) | |
tree | c88f5f5518be0fe0c894f353dd9ae4b4f2fc3a86 | |
parent | c883f84aa58838d45a962a89332610c262121c9f (diff) | |
download | rt.equinox.bundles-d434dc1c887cd05b0f7326ca20b2aa721b915028.tar.gz rt.equinox.bundles-d434dc1c887cd05b0f7326ca20b2aa721b915028.tar.xz rt.equinox.bundles-d434dc1c887cd05b0f7326ca20b2aa721b915028.zip |
Bug 384204 - Deadlock in EclipsePreferences.shareStringsv20120704-185339I20120812-1736I20120810-1300I20120808-2000I20120808-0800I20120807-2000I20120807-0800I20120806-2000I20120806-0800I20120805-2000I20120801-1800I20120731-0800I20120725-1800I20120724-0800I20120717-0800I20120710-0800
-rw-r--r-- | bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/EclipsePreferences.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/EclipsePreferences.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/EclipsePreferences.java index 920345974..1e98e4ed5 100644 --- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/EclipsePreferences.java +++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/EclipsePreferences.java @@ -369,7 +369,6 @@ public class EclipsePreferences implements IEclipsePreferences, IScope { String fullPath = addSeparator ? prefix + PATH_SEPARATOR + child.name() : child.name(); child.convertToProperties(result, fullPath); } - PreferencesService.getDefault().shareStrings(); return result; } @@ -428,6 +427,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope { synchronized (childAndPropertyLock) { internalFlush(); } + PreferencesService.getDefault().shareStrings(); } /* |