svn commit: r1869433 - /uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMonitor.java

[degenaro]

Author: degenaro
Date: Tue Nov  5 21:31:34 2019
New Revision: 1869433

URL: http://svn.apache.org/viewvc?rev=1869433&view=rev
Log:
UIMA-6073 DUCC Web Server (WS) should discard "down" machines from machines page

Modified:
    
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMonitor.java

Modified: 
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMonitor.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMonitor.java?rev=1869433&r1=1869432&r2=1869433&view=diff
==============================================================================
--- 
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMonitor.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMonitor.java
 Tue Nov  5 21:31:34 2019
@@ -43,8 +43,8 @@ public class DuccMonitor extends Thread
                String location = "turn_on";
                try {
                        if(instance == null) {
-                               instance.no_kill_i.set(true);
                                instance = new DuccMonitor();
+                               instance.no_kill_i.set(true);
                                instance.start();
                                logger.info(location, jobid, "");
                        }
@@ -61,9 +61,12 @@ public class DuccMonitor extends Thread
        public static void turn_off() {
                String location = "turn_off";
                try {
-                       instance.no_kill_i.set(false);
-                       instance = null;
-                       logger.info(location, jobid, "");
+                       if(instance != null) {
+                               instance.no_kill_i.set(false);
+                               instance = null;
+                               logger.info(location, jobid, "");
+                       }
+                       logger.debug(location, jobid, "");
                }
                catch(Exception e) {
                        logger.error(location, jobid, e);