From 0fbc2df17d040667df3709c62f1a6f614da484dd Mon Sep 17 00:00:00 2001 From: Max Schenkelberg Date: Wed, 5 Mar 2014 13:51:06 -0600 Subject: [PATCH] Issue #2861 added synchronized blocks where necessary Change-Id: I86a483612f618b04c1ef938ebc8f95decb496811 Former-commit-id: 10bfa59aefd6fe081fb497cd76f4918e0386b1f2 [formerly 1c019671d35dc4d544fa9ceaeabe0a075e3e5ede] Former-commit-id: b5ed7ac361a04eccd3b3845b26cd209132e6ceeb --- .../core/localization/HierarchicalPreferenceStore.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/HierarchicalPreferenceStore.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/HierarchicalPreferenceStore.java index 66eaef9509..c15c7af4b6 100644 --- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/HierarchicalPreferenceStore.java +++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/HierarchicalPreferenceStore.java @@ -100,7 +100,7 @@ public class HierarchicalPreferenceStore implements IPersistentPreferenceStore { this.config = new XMLConfiguration(); } - public XMLConfiguration accessConfiguration() { + public synchronized XMLConfiguration accessConfiguration() { if (loaded == false) { // Loaded flag is used for first access loaded = true; @@ -122,10 +122,6 @@ public class HierarchicalPreferenceStore implements IPersistentPreferenceStore { return dirty; } - public LocalizationFile getFile() { - return file; - } - public void save() throws LocalizationException { if (isDirty()) { LocalizationFileOutputStream out = file.openOutputStream(); @@ -220,7 +216,7 @@ public class HierarchicalPreferenceStore implements IPersistentPreferenceStore { this.defaultPersistLevel = defaultLevel; } - private MapConfiguration getDefaultConfig() { + private synchronized MapConfiguration getDefaultConfig() { if (defaults == null) { defaults = new MapConfiguration(new HashMap()); // Populate defaults with base first, setDefault* method will