Changeset 7107 in josm for trunk/src/org

Timestamp:

2014-05-11T17:36:15+02:00 (11 years ago)

Author:

bastiK

Message:

mappaint: hold read lock on Dataset during painting, so modifications do not lead to inconsistent state (fixes #8671, see #9691)

File:

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

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -1511 +1511 @@
         }
 
-        List<Node> nodes = data.searchNodes(bbox);
-        List<Way> ways = data.searchWays(bbox);
-        List<Relation> relations = data.searchRelations(bbox);
-
-        final List<StyleRecord> allStyleElems = new ArrayList<>(nodes.size()+ways.size()+relations.size());
-
-        ConcurrentTasksHelper helper = new ConcurrentTasksHelper(allStyleElems, data);
-
-        // Need to process all relations first.
-        // Reason: Make sure, ElemStyles.getStyleCacheWithRange is
-        // not called for the same primitive in parallel threads.
-        // (Could be synchronized, but try to avoid this for
-        // performance reasons.)
-        helper.process(relations);
-        helper.process(new CompositeList<>(nodes, ways));
-
-        if (Main.isTraceEnabled()) {
-            timePhase1 = System.currentTimeMillis();
-            System.err.print("phase 1 (calculate styles): " + (timePhase1 - timeStart) + " ms");
-        }
-
-        Collections.sort(allStyleElems);
-
-        for (StyleRecord r : allStyleElems) {
-            r.style.paintPrimitive(
-                    r.osm,
-                    paintSettings,
-                    StyledMapRenderer.this,
-                    (r.flags & FLAG_SELECTED) != 0,
-                    (r.flags & FLAG_MEMBER_OF_SELECTED) != 0
-            );
-        }
-
-        if (Main.isTraceEnabled()) {
-            timeFinished = System.currentTimeMillis();
-            System.err.println("; phase 2 (draw): " + (timeFinished - timePhase1) + " ms; total: " + (timeFinished - timeStart) + " ms");
-        }
-
-        drawVirtualNodes(data, bbox);
+        data.getReadLock().lock();
+        try {
+            List<Node> nodes = data.searchNodes(bbox);
+            List<Way> ways = data.searchWays(bbox);
+            List<Relation> relations = data.searchRelations(bbox);
+
+            final List<StyleRecord> allStyleElems = new ArrayList<>(nodes.size()+ways.size()+relations.size());
+
+            ConcurrentTasksHelper helper = new ConcurrentTasksHelper(allStyleElems, data);
+
+            // Need to process all relations first.
+            // Reason: Make sure, ElemStyles.getStyleCacheWithRange is
+            // not called for the same primitive in parallel threads.
+            // (Could be synchronized, but try to avoid this for
+            // performance reasons.)
+            helper.process(relations);
+            helper.process(new CompositeList<>(nodes, ways));
+
+            if (Main.isTraceEnabled()) {
+                timePhase1 = System.currentTimeMillis();
+                System.err.print("phase 1 (calculate styles): " + (timePhase1 - timeStart) + " ms");
+            }
+
+            Collections.sort(allStyleElems);
+
+            for (StyleRecord r : allStyleElems) {
+                r.style.paintPrimitive(
+                        r.osm,
+                        paintSettings,
+                        StyledMapRenderer.this,
+                        (r.flags & FLAG_SELECTED) != 0,
+                        (r.flags & FLAG_MEMBER_OF_SELECTED) != 0
+                );
+            }
+
+            if (Main.isTraceEnabled()) {
+                timeFinished = System.currentTimeMillis();
+                System.err.println("; phase 2 (draw): " + (timeFinished - timePhase1) + " ms; total: " + (timeFinished - timeStart) + " ms");
+            }
+
+            drawVirtualNodes(data, bbox);
+        } finally {
+            data.getReadLock().unlock();
+        }
     }
 }