Changeset 15812 in josm for trunk/src/org

Timestamp:

2020-02-03T08:26:24+01:00 (5 years ago)

Author:

GerdP

Message:

see #18566: fix findbugs UWF_UNWRITTEN_FIELD introduced with r15811

To be honest, I don't understand the synchronized (this) blocks in the code. Looks like an incomplete approach to implement a "download in background". Hope this change doesn't block anything.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java

@@ -19 +19 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.MultiFetchServerObjectReader;
-import org.openstreetmap.josm.io.OsmServerReader;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -35 +34 @@
     private final Collection<Relation> relations;
     private final OsmDataLayer layer;
-    private OsmServerReader objectReader;
+    private MultiFetchServerObjectReader multiObjectReader;
 
     /**
@@ -60 +59 @@
         canceled = true;
         synchronized (this) {
-            if (objectReader != null) {
-                objectReader.cancel();
+            if (multiObjectReader != null) {
+                multiObjectReader.cancel();
             }
         }
@@ -80 +79 @@
             final DataSet allDownloads = new DataSet();
             getProgressMonitor().setTicksCount(relations.size());
-            MultiFetchServerObjectReader multiObjectReader;
+            DataSet dataSet = null;
             synchronized (this) {
                 if (canceled)
                     return;
                 multiObjectReader = MultiFetchServerObjectReader.create();
+                multiObjectReader.setRecurseDownRelations(true).setRecurseDownAppended(false);
+                multiObjectReader.append(relations);
+                dataSet = multiObjectReader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
             }
-            multiObjectReader.setRecurseDownRelations(true).setRecurseDownAppended(false);
-            multiObjectReader.append(relations);
-            DataSet dataSet = multiObjectReader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
             if (dataSet == null)
                 return;