From 6efbd6462592c2de691d30ad2f513f3fce1827e1 Mon Sep 17 00:00:00 2001
From: Taylor Smock <taylor.smock@kaart.com>
Date: Thu, 4 Jun 2020 10:37:58 -0600
Subject: [PATCH] Fix a probable deadlock

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
---
 .../gui/download/MapWithAIDownloadReader.java | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/gui/download/MapWithAIDownloadReader.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/gui/download/MapWithAIDownloadReader.java
index 6d6ac05..8a59eab 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/gui/download/MapWithAIDownloadReader.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/gui/download/MapWithAIDownloadReader.java
@@ -11,6 +11,8 @@ import java.awt.GridBagLayout;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
 import javax.swing.Icon;
@@ -47,14 +49,16 @@ public class MapWithAIDownloadReader implements DownloadSource<MapWithAIDownload
         task.setZoomAfterDownload(settings.zoomToData());
         DownloadParams params = new DownloadParams();
         params.withNewLayer(settings.asNewLayer());
-        try {
-            task.download(params, area, null).get();
-        } catch (InterruptedException e) {
-            Logging.error(e);
-            Thread.currentThread().interrupt();
-        } catch (ExecutionException e) {
-            Logging.error(e);
-        }
+        MapWithAIDataUtils.getForkJoinPool().execute(() -> {
+            try {
+                task.download(params, area, null).get(300, TimeUnit.SECONDS);
+            } catch (InterruptedException e) {
+                Logging.error(e);
+                Thread.currentThread().interrupt();
+            } catch (ExecutionException | TimeoutException e) {
+                Logging.error(e);
+            }
+        });
     }
 
     @Override