Changeset 8412 in josm for trunk/src/org/openstreetmap/josm/Main.java

Timestamp:

2015-05-22T01:06:28+02:00 (11 years ago)

Author:

Don-vip

Message:

ExecutorService field doesn't ever get shutdown

File:

• trunk/src/org/openstreetmap/josm/Main.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -1081 +1081 @@
 
     /**
-     * Closes JOSM and optionally terminates the Java Virtual Machine (JVM). If there are some unsaved data layers, asks first for user confirmation.
+     * Closes JOSM and optionally terminates the Java Virtual Machine (JVM).
+     * If there are some unsaved data layers, asks first for user confirmation.
      * @param exit If {@code true}, the JVM is terminated by running {@link System#exit} with a given return code.
      * @param exitCode The return code
@@ -1088 +1089 @@
      */
     public static boolean exitJosm(boolean exit, int exitCode) {
-        JCSCacheManager.shutdown();
         if (Main.saveUnsavedModifications()) {
+            worker.shutdown();
+            ImageProvider.shutdown(false);
+            JCSCacheManager.shutdown();
             geometry.remember("gui.geometry");
             if (map != null) {
@@ -1102 +1105 @@
                 }
             }
+            worker.shutdownNow();
+            ImageProvider.shutdown(true);
+
             if (exit) {
                 System.exit(exitCode);