Changeset 12055 in josm for trunk/src

Timestamp:

2017-05-03T20:06:36+02:00 (7 years ago)

Author:

michael2402

Message:

Disable the read lock of the dataset while selection listeners are fired - they might want to write lock it.

File:

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

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

@@ -911 +911 @@
      */
     private boolean doSelectionChange(Function<Set<OsmPrimitive>, SelectionChangeEvent> command) {
-        lock.readLock().lock();
-        try {
-            synchronized (selectionLock) {
-                SelectionChangeEvent event = command.apply(currentSelectedPrimitives);
-                if (event.isNop()) {
-                    return false;
-                }
-                currentSelectedPrimitives = event.getSelection();
-                selectionListeners.fireEvent(l -> l.selectionChanged(event));
-                return true;
-            }
-        } finally {
-            lock.readLock().unlock();
+        synchronized (selectionLock) {
+            SelectionChangeEvent event = command.apply(currentSelectedPrimitives);
+            if (event.isNop()) {
+                return false;
+            }
+            currentSelectedPrimitives = event.getSelection();
+            selectionListeners.fireEvent(l -> l.selectionChanged(event));
+            return true;
         }
     }