Changeset 6980 in josm for trunk

Timestamp:

2014-04-15T13:29:31+02:00 (11 years ago)

Author:

Don-vip

Message:

see #9634 - fix sonar issue - inconsistent synchronization

File:

• trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java

@@ -95 +95 @@
         // First, download primitives
         mainTask = new DownloadPrimitivesTask(tmpLayer, ids, full, getProgressMonitor().createSubTaskMonitor(1, false));
-        currentTask = mainTask;
-        synchronized(this) {
+        synchronized(this) {
+            currentTask = mainTask;
             if(canceled) {
                 currentTask = null;
@@ -121 +121 @@
     @Override
     protected void finish() {
-        if(canceled)
-            return;
+        synchronized(this) {
+            if(canceled)
+                return;
+        }
 
         // Append downloaded data to JOSM
@@ -183 +185 @@
      */
     public List<PrimitiveId> getDownloadedId() {
-        if(canceled)
-            return null;
+        synchronized(this) {
+            if(canceled)
+                return null;
+        }
         ArrayList<PrimitiveId> downloaded = new ArrayList<PrimitiveId>(ids);
         downloaded.removeAll(mainTask.getMissingPrimitives());