Changeset 17654 in josm for trunk

Timestamp:

2021-03-24T08:16:29+01:00 (4 years ago)

Author:

GerdP

Message:

fix #20416: Download (incomplete) members: Cancel does not work and timeouts while download relation with members works

• let the Cancel button do a shutdownNow() on the executor so that user doesn't have to wait (I hope)

File:

• trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified) (4 diffs)

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

@@ -81 +81 @@
     private boolean recurseDownAppended = true;
 
+    private ExecutorService exec;
+
     /**
      * Constructs a {@code MultiFetchServerObjectReader}.
@@ -320 +322 @@
         int threadsNumber = Config.getPref().getInt("osm.download.threads", OsmApi.MAX_DOWNLOAD_THREADS);
         threadsNumber = Utils.clamp(threadsNumber, 1, OsmApi.MAX_DOWNLOAD_THREADS);
-        final ExecutorService exec = Executors.newFixedThreadPool(
+        exec = Executors.newFixedThreadPool(
                 threadsNumber, Utils.newThreadFactory(getClass() + "-%d", Thread.NORM_PRIORITY));
         CompletionService<FetchResult> ecs = new ExecutorCompletionService<>(exec);
         List<Future<FetchResult>> jobs = new ArrayList<>();
-        while (!toFetch.isEmpty()) {
+        while (!toFetch.isEmpty() && !isCanceled()) {
             jobs.add(ecs.submit(new Fetcher(type, extractIdPackage(toFetch), progressMonitor)));
         }
@@ -358 +360 @@
             }
         }
+        exec = null;
     }
 
@@ -706 +709 @@
         }
     }
+
+    @Override
+    public void cancel() {
+        super.cancel();
+        if (exec != null)
+            exec.shutdownNow();
+    }
 }