From 207161b6c6473fcf5019188ba0969290a8d97dcb Mon Sep 17 00:00:00 2001 From: Taylor Smock Date: Thu, 6 Oct 2022 15:24:06 -0600 Subject: [PATCH] Fix #22316: CancellationException when cancelling after OSM download screen Signed-off-by: Taylor Smock --- .../plugins/mapwithai/backend/DownloadMapWithAITask.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/DownloadMapWithAITask.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/DownloadMapWithAITask.java index 28fc656..e60f47b 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/DownloadMapWithAITask.java +++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/DownloadMapWithAITask.java @@ -8,6 +8,7 @@ import java.net.URL; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.concurrent.CancellationException; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.ForkJoinPool; @@ -29,6 +30,7 @@ import org.openstreetmap.josm.io.OsmTransferException; import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAIInfo; import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAILayerInfo; import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.tools.Logging; import org.openstreetmap.josm.tools.Utils; import org.xml.sax.SAXException; @@ -148,6 +150,9 @@ public class DownloadMapWithAITask extends DownloadOsmTask { try { DownloadMapWithAITask.this.downloadedData.mergeFrom(task.get(), monitor.createSubTaskMonitor(1, false)); + } catch (CancellationException e) { + Logging.trace(e); + return; } catch (InterruptedException e) { Thread.currentThread().interrupt(); this.downloader.forEach(t -> t.cancel(true));