Changeset 2322 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2009-10-25T23:09:53+01:00 (15 years ago)

Author:

Gubaer

Message:

Added canceling of DownloadOsmTaskLists
Removed error remembering in the progress dialog

File:

• trunk/src/org/openstreetmap/josm/io/OsmConnection.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/OsmConnection.java

@@ -97 +97 @@
     public void cancel() {
         cancel = true;
-        if (activeConnection != null) {
-            activeConnection.setConnectTimeout(100);
-            activeConnection.setReadTimeout(100);
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException ex) {}
-            activeConnection.disconnect();
+        synchronized (this) {
+            if (activeConnection != null) {
+                activeConnection.setConnectTimeout(100);
+                activeConnection.setReadTimeout(100);
+            }
+        }
+        try {
+            Thread.sleep(100);
+        } catch (InterruptedException ex) {
+        }
+
+        synchronized (this) {
+            if (activeConnection != null) {
+                activeConnection.disconnect();
+            }
         }
     }