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

Timestamp:

2010-08-23T15:05:06+02:00 (14 years ago)

Author:

bastiK

Message:

fixed #5365 - Deadlock when using tracer plugin

File:

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

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

@@ -431 +431 @@
      */
     public void setSelected(Collection<? extends PrimitiveId> selection, boolean fireSelectionChangeEvent) {
-        boolean wasEmpty;
+        boolean changed;
         synchronized (selectionLock) {
-            wasEmpty = selectedPrimitives.isEmpty();
+            boolean wasEmpty = selectedPrimitives.isEmpty();
             selectedPrimitives = new LinkedHashSet<OsmPrimitive>();
-            addSelected(selection, fireSelectionChangeEvent);
-            if (!wasEmpty && selectedPrimitives.isEmpty()) {
+            changed = addSelected(selection, false)
+                            || (!wasEmpty && selectedPrimitives.isEmpty());
+            if (changed) {
                 selectionSnapshot = null;
             }
         }
 
-        if (!wasEmpty && selectedPrimitives.isEmpty() && fireSelectionChangeEvent) {
+        if (changed && fireSelectionChangeEvent) {
             // If selection is not empty then event was already fired in addSelecteds
             fireSelectionChanged();
@@ -486 +487 @@
      * @param selection the selection
      * @param fireSelectionChangeEvent true, if the selection change listeners are to be notified; false, otherwise
-     */
-    public void addSelected(Collection<? extends PrimitiveId> selection, boolean fireSelectionChangeEvent) {
+     * @return if the selection was changed in the process
+     */
+    private boolean addSelected(Collection<? extends PrimitiveId> selection, boolean fireSelectionChangeEvent) {
         boolean changed = false;
         synchronized (selectionLock) {
@@ -503 +505 @@
             fireSelectionChanged();
         }
+        return changed;
     }