- Timestamp:
- 2017-05-10T23:15:07+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
r12078 r12100 35 35 import java.util.Optional; 36 36 import java.util.concurrent.ForkJoinPool; 37 import java.util.concurrent.TimeUnit; 37 38 import java.util.function.BiConsumer; 38 39 import java.util.function.Consumer; … … 80 81 import org.openstreetmap.josm.tools.ImageProvider; 81 82 import org.openstreetmap.josm.tools.JosmRuntimeException; 83 import org.openstreetmap.josm.tools.Logging; 82 84 import org.openstreetmap.josm.tools.Utils; 83 85 import org.openstreetmap.josm.tools.bugreport.BugReport; … … 1529 1531 getSettings(renderVirtualNodes); 1530 1532 1531 data.getReadLock().lock(); 1533 try { 1534 if (data.getReadLock().tryLock(1, TimeUnit.SECONDS)) { 1535 try { 1536 paintWithLock(data, renderVirtualNodes, benchmark, bbox); 1537 } finally { 1538 data.getReadLock().unlock(); 1539 } 1540 } else { 1541 Logging.warn("Cannot paint layer {0}: It is locked."); 1542 } 1543 } catch (InterruptedException e) { 1544 Logging.warn("Cannot paint layer {0}: Interrupted"); 1545 } 1546 } 1547 1548 private void paintWithLock(final DataSet data, boolean renderVirtualNodes, RenderBenchmarkCollector benchmark, 1549 BBox bbox) { 1532 1550 try { 1533 1551 highlightWaySegments = data.getHighlightedWaySegments(); … … 1575 1593 .put("paintSettings", paintSettings) 1576 1594 .put("renderVirtualNodes", renderVirtualNodes); 1577 } finally {1578 data.getReadLock().unlock();1579 1595 } 1580 1596 }
Note:
See TracChangeset
for help on using the changeset viewer.