Changeset 22720 in osm for applications/editors/josm/plugins/wmsplugin/src

Timestamp:

2010-08-21T19:01:16+02:00 (14 years ago)

Author:

jttt

Message:

Fix #5357 JOSM blocks due to WMS-Plugin / unhandled exception

Location:

applications/editors/josm/plugins/wmsplugin/src/wmsplugin

Files:

• Grabber.java (modified) (1 diff)
• WMSLayer.java (modified) (2 diffs)

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Grabber.java

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

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java

@@ -412 +412 @@
 
         public void finishRequest(WMSRequest request) {
+                if (request.getState() == null) {
+                        throw new IllegalArgumentException("Finished request without state");
+                }
                 requestQueueLock.lock();
                 try {
@@ -445 +448 @@
                                 }
                         }
+                } finally {
                         finishedRequests.clear();
-                } finally {
                         requestQueueLock.unlock();
                 }