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

Timestamp:

2016-10-08T23:17:38+02:00 (8 years ago)

Author:

Don-vip

Message:

do not shutdown static executor services in headless mode for jenkins unit tests

File:

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

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

@@ -6 +6 @@
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.GraphicsEnvironment;
 import java.awt.Window;
 import java.awt.event.KeyEvent;
@@ -817 +818 @@
 
     protected void shutdown() {
-        worker.shutdown();
-        ImageProvider.shutdown(false);
-        JCSCacheManager.shutdown();
+        if (!GraphicsEnvironment.isHeadless()) {
+            worker.shutdown();
+            ImageProvider.shutdown(false);
+            JCSCacheManager.shutdown();
+        }
         if (map != null) {
             map.rememberToggleDialogWidth();
@@ -830 +833 @@
             Main.warn(ex, tr("Failed to save default preferences."));
         }
-        worker.shutdownNow();
-        ImageProvider.shutdown(true);
+        if (!GraphicsEnvironment.isHeadless()) {
+            worker.shutdownNow();
+            ImageProvider.shutdown(true);
+        }
     }