Changeset 17496 in josm for trunk

Timestamp:

2021-02-20T09:35:18+01:00 (4 years ago)

Author:

wiktorn

Message:

Fix regression from [17494]

Do not shutdown the thread pool, if this is default one. We do share one thread pool
for all TMS downloads.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/TMSCachedTileLoader.java (modified) (1 diff)
• gui/layer/AbstractTileSourceLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java

@@ -158 +158 @@
         return downloadExecutor;
     }
+
+    /**
+     * Shutdown the job dispatcher provided that it's not the default one
+     */
+    public void shutdown() {
+        if (!downloadExecutor.equals(DEFAULT_DOWNLOAD_JOB_DISPATCHER)) {
+            downloadExecutor.shutdown();
+        }
+    }
 }

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -1884 +1884 @@
                 TMSCachedTileLoader cachedTileLoader = (TMSCachedTileLoader) tileLoader;
                 cachedTileLoader.cancelOutstandingTasks();
-                cachedTileLoader.getDownloadExecutor().shutdown();
+                cachedTileLoader.shutdown();
             }
         }
@@ -1904 +1904 @@
                 TMSCachedTileLoader cachedTileLoader = (TMSCachedTileLoader) tileLoader;
                 cachedTileLoader.cancelOutstandingTasks();
-                cachedTileLoader.getDownloadExecutor().shutdown();
+                cachedTileLoader.shutdown();
             }
         }
@@ -1964 +1964 @@
         if (tileLoader instanceof TMSCachedTileLoader) {
             TMSCachedTileLoader cachedTileLoader = (TMSCachedTileLoader) tileLoader;
-            cachedTileLoader.getDownloadExecutor().shutdown();
+            cachedTileLoader.shutdown();
         }
     }