| commit | d434dc1c887cd05b0f7326ca20b2aa721b915028 | [log] [tgz] |
|---|---|---|
| author | John Arthorne <John_Arthorne@ca.ibm.com> | Wed Jul 04 14:53:39 2012 -0400 |
| committer | John Arthorne <John_Arthorne@ca.ibm.com> | Wed Jul 04 14:53:39 2012 -0400 |
| tree | c88f5f5518be0fe0c894f353dd9ae4b4f2fc3a86 | |
| parent | c883f84aa58838d45a962a89332610c262121c9f [diff] |
Bug 384204 - Deadlock in EclipsePreferences.shareStrings
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 9203459..1e98e4e 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 @@ String fullPath = addSeparator ? prefix + PATH_SEPARATOR + child.name() : child.name(); child.convertToProperties(result, fullPath); } - PreferencesService.getDefault().shareStrings(); return result; } @@ -428,6 +427,7 @@ synchronized (childAndPropertyLock) { internalFlush(); } + PreferencesService.getDefault().shareStrings(); } /*