Changeset 2515 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-11-25T17:58:39+01:00 (15 years ago)

Author:

hansendc

Message:

Fix ConcurrentModificationException on selListeners

​http://josm.openstreetmap.de/ticket/3258

and some other duplicate bugs have run into this. This should
at least synchronize any modification operations with the
DataSet iteration. The only other concern would be if there
are other users around iterating over selListeners.

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -248 +248 @@
      * dataset. (However, the selection does only change in the active layer)
      */
-    public static Collection<SelectionChangedListener> selListeners = new LinkedList<SelectionChangedListener>();
+    public static Collection<SelectionChangedListener> selListeners = 
+        Collections.synchronizedList(new LinkedList<SelectionChangedListener>());
 
     /**
@@ -257 +258 @@
      */
     private static void notifySelectionChangeListeners(Collection<? extends OsmPrimitive> sel) {
-        for (SelectionChangedListener l : selListeners) {
-            l.selectionChanged(sel);
+        synchronized (selListeners) {
+            for (SelectionChangedListener l : selListeners) {
+                l.selectionChanged(sel);
+            }
         }
     }