Changeset 13653 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-04-21T02:08:55+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15744 - Don't use ForkJoinPool.commonPool for async image fetch, causes problems with WebStart

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -685 +685 @@
     public CompletableFuture<Void> getAsync(Consumer<? super ImageIcon> action) {
         return isRemote()
-                ? CompletableFuture.supplyAsync(this::get, IMAGE_FETCHER).thenAcceptAsync(action)
+                ? CompletableFuture.supplyAsync(this::get, IMAGE_FETCHER).thenAcceptAsync(action, IMAGE_FETCHER)
                 : CompletableFuture.completedFuture(get()).thenAccept(action);
     }
@@ -730 +730 @@
     public CompletableFuture<Void> getResourceAsync(Consumer<? super ImageResource> action) {
         return isRemote()
-                ? CompletableFuture.supplyAsync(this::getResource, IMAGE_FETCHER).thenAcceptAsync(action)
+                ? CompletableFuture.supplyAsync(this::getResource, IMAGE_FETCHER).thenAcceptAsync(action, IMAGE_FETCHER)
                 : CompletableFuture.completedFuture(getResource()).thenAccept(action);
     }