dont' create blockmanaagaer, shutdownmanager if not present

JMRI · May 17, 2020 · 845577e · 845577e
1 parent 7bb90e9
commit 845577e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/java/test/jmri/util/JUnitUtil.java b/java/test/jmri/util/JUnitUtil.java
@@ -742,6 +742,9 @@ public static void initOBlockManager() {
     }
 
     public static void deregisterBlockManagerShutdownTask() {
+        if (! InstanceManager.isInitialized(ShutDownManager.class)) return;
+        if (! InstanceManager.isInitialized(BlockManager.class)) return;
+
         InstanceManager
                 .getDefault(ShutDownManager.class)
                 .deregister(InstanceManager.getDefault(BlockManager.class).shutDownTask);