Changeset 3749 in josm for trunk/src/org

Timestamp:

2010-12-28T18:40:12+01:00 (14 years ago)

Author:

jttt

Message:

Fix loading of wms tiles (when mapview is moved and then moved back then request can stay in processingList and be skipped for ever)

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/WMSLayer.java (modified) (1 diff)
• io/imagery/Grabber.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

@@ -462 +462 @@
 
     public void finishRequest(WMSRequest request) {
-        if (request.getState() == null)
-            throw new IllegalArgumentException("Finished request without state");
         requestQueueLock.lock();
         try {
             processingRequests.remove(request);
-            finishedRequests.add(request);
+            if (request.getState() != null) {
+                finishedRequests.add(request);
+                mv.repaint();
+            }
         } finally {
             requestQueueLock.unlock();

trunk/src/org/openstreetmap/josm/io/imagery/Grabber.java

@@ -71 +71 @@
                 attempt(request);
             }
-            if (request.getState() != null) {
-                layer.finishRequest(request);
-                mv.repaint();
-            }
+            layer.finishRequest(request);
         }
     }