Changeset 3782 in josm for trunk/src/org

Timestamp:

2011-01-09T18:19:37+01:00 (14 years ago)

Author:

jttt

Message:

Fix #5814 middleclick on way getting drawn locks josm completely

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DataSet.java (modified) (1 diff)
• gui/MapStatus.java (modified) (3 diffs)

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

@@ -74 +74 @@
  * Note that it is not necessary to call beginUpdate/endUpdate for every dataset modification - dataset will get locked
  * automatically.
+ * 
+ * Note that locks cannot be upgraded - if one threads use read lock and and then write lock, dead lock will occur - see #5814 for
+ * sample ticket
  *
  * @author imi

trunk/src/org/openstreetmap/josm/gui/MapStatus.java

@@ -173 +173 @@
                     // the data.
                     DataSet ds = null;
+                    // The popup != null check is required because a left-click
+                    // produces several events as well, which would make this
+                    // variable true. Of course we only want the popup to show
+                    // if the middle mouse button has been pressed in the first
+                    // place
+                    boolean isAtOldPosition = (oldMousePos != null
+                            && oldMousePos.equals(ms.mousePos)
+                            && popup != null);
+                    boolean middleMouseDown = (ms.modifiers & MouseEvent.BUTTON2_DOWN_MASK) != 0;
                     try {
                         ds = mv.getCurrentDataSet();
                         if (ds != null) {
                             // This is not perfect, if current dataset was changed during execution, the lock would be useless
-                            ds.getReadLock().lock();
+                            if(isAtOldPosition && middleMouseDown) {
+                                // Write lock is necessary when selecting in popupCycleSelection
+                                // locks can not be upgraded -> if do read lock here and write lock later (in OsmPrimitive.updateFlags)
+                                // then always occurs deadlock (#5814)
+                                ds.beginUpdate();
+                            } else {
+                                ds.getReadLock().lock();
+                            }
                         }
 
@@ -183 +199 @@
                         statusBarElementUpdate(ms);
 
-                        // The popup != null check is required because a left-click
-                        // produces several events as well, which would make this
-                        // variable true. Of course we only want the popup to show
-                        // if the middle mouse button has been pressed in the first
-                        // place
-                        boolean isAtOldPosition = (oldMousePos != null
-                                && oldMousePos.equals(ms.mousePos)
-                                && popup != null);
-                        boolean middleMouseDown = (ms.modifiers & MouseEvent.BUTTON2_DOWN_MASK) != 0;
 
                         // Popup Information
@@ -247 +254 @@
                     } finally {
                         if (ds != null) {
-                            ds.getReadLock().unlock();
+                            if(isAtOldPosition && middleMouseDown) {
+                                ds.endUpdate();
+                            } else {
+                                ds.getReadLock().unlock();
+                            }
                         }
                     }