clean up

kiwi64ajs · Jul 3, 2023 · c22b9af · c22b9af
1 parent 59bce22
commit c22b9af
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/java/src/jmri/managers/DefaultShutDownManager.java b/java/src/jmri/managers/DefaultShutDownManager.java
@@ -92,16 +92,18 @@ public void handle(Signal sig) {
                 shutdown();
             }
         };
-        if (SystemType.isMacOSX() || SystemType.isLinux()) {
-            Signal.handle(new Signal("HUP"), handler);
-            Signal.handle(new Signal("TERM"), handler);
-            Signal.handle(new Signal("INT"), handler);
-        } 
-        if (SystemType.isWindows()) {
-            //Signal.handle(new Signal("BREAK"), handler);
-            Signal.handle(new Signal("TERM"), handler);
-            //Signal.handle(new Signal("INT"), handler);
-        } 
+        try {
+            if (SystemType.isMacOSX() || SystemType.isLinux()) {
+                Signal.handle(new Signal("HUP"), handler);
+                Signal.handle(new Signal("TERM"), handler);
+                Signal.handle(new Signal("INT"), handler);
+            } 
+            if (SystemType.isWindows()) {
+                Signal.handle(new Signal("TERM"), handler);
+            }
+        } catch (NullPointerException e) {
+            log.warn("Failed to add signal handler due to missing signal definition");
+        }
     }
 
     /**