Changeset 14052 in josm for trunk/src/org/openstreetmap/josm/gui/MainApplication.java

Timestamp:

2018-07-26T22:01:31+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16010 - use JMockit to enable more extensive test coverage (patch by ris, modified)

see ​https://github.com/openstreetmap/josm/pull/24/commits for details

File:

• trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -488 +488 @@
     @Override
     protected void shutdown() {
-        if (!GraphicsEnvironment.isHeadless()) {
-            try {
-                worker.shutdown();
-            } catch (SecurityException e) {
-                Logging.log(Logging.LEVEL_ERROR, "Unable to shutdown worker", e);
-            }
-            JCSCacheManager.shutdown();
-        }
+        try {
+            worker.shutdown();
+        } catch (SecurityException e) {
+            Logging.log(Logging.LEVEL_ERROR, "Unable to shutdown worker", e);
+        }
+        JCSCacheManager.shutdown();
+
         if (mainFrame != null) {
             mainFrame.storeState();
@@ -505 +504 @@
         layerManager.resetState();
         super.shutdown();
-        if (!GraphicsEnvironment.isHeadless()) {
-            try {
-                worker.shutdownNow();
-            } catch (SecurityException e) {
-                Logging.log(Logging.LEVEL_ERROR, "Unable to shutdown worker", e);
-            }
+
+        try {
+            // in case the current task still hasn't finished
+            worker.shutdownNow();
+        } catch (SecurityException e) {
+            Logging.log(Logging.LEVEL_ERROR, "Unable to shutdown worker", e);
         }
     }