Changeset 10380 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2016-06-15T11:31:38+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #12963 - ConcurrentModificationException in PreferencesWriter.write during restart

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -507 +507 @@
      * @throws IOException if any I/O error occurs
      */
-    public void save() throws IOException {
+    public synchronized void save() throws IOException {
         save(getPreferenceFile(),
                 new FilteredCollection<>(settingsMap.entrySet(), NO_DEFAULT_SETTINGS_ENTRY), false);
     }
 
-    public void saveDefaults() throws IOException {
+    public synchronized void saveDefaults() throws IOException {
         save(getDefaultsCacheFile(), defaultsMap.entrySet(), true);
     }
 
-    public void save(File prefFile, Collection<Entry<String, Setting<?>>> settings, boolean defaults) throws IOException {
+    protected void save(File prefFile, Collection<Entry<String, Setting<?>>> settings, boolean defaults) throws IOException {
 
         if (!defaults) {