Changeset 16958 in josm

Timestamp:

2020-08-29T09:28:23+02:00 (4 years ago)

Author:

simon04

Message:

fix #19729 - Main initialization: use ForkJoinPool.commonPool

File:

• trunk/src/org/openstreetmap/josm/spi/lifecycle/Lifecycle.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/spi/lifecycle/Lifecycle.java

@@ -6 +6 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.Future;
 
 import org.openstreetmap.josm.tools.JosmRuntimeException;
-import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
 
@@ -73 +71 @@
         // Initializes tasks to be executed (in parallel) by a ExecutorService
         try {
-            ExecutorService service = Executors.newFixedThreadPool(
-                    Runtime.getRuntime().availableProcessors(), Utils.newThreadFactory("main-init-%d", Thread.NORM_PRIORITY));
+            ExecutorService service = ForkJoinPool.commonPool();
             for (Future<Void> i : service.invokeAll(initSequence.parallelInitializationTasks())) {
                 i.get();
@@ -81 +78 @@
             initSequence.asynchronousRunnableTasks().forEach(service::submit);
             initSequence.asynchronousCallableTasks().forEach(service::submit);
-            try {
-                service.shutdown();
-            } catch (SecurityException e) {
-                Logging.log(Logging.LEVEL_ERROR, "Unable to shutdown executor service", e);
-            }
         } catch (InterruptedException | ExecutionException ex) {
             throw new JosmRuntimeException(ex);