You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ch...@apache.org on 2014/09/29 19:57:50 UTC

svn commit: r1628236 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm: PingOnlyServiceInstance.java ServiceSet.java

Author: challngr
Date: Mon Sep 29 17:57:49 2014
New Revision: 1628236

URL: http://svn.apache.org/r1628236
Log:
UIMA-4030 Properly clear ping-only service instance from records on stop.

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingOnlyServiceInstance.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingOnlyServiceInstance.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingOnlyServiceInstance.java?rev=1628236&r1=1628235&r2=1628236&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingOnlyServiceInstance.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingOnlyServiceInstance.java Mon Sep 29 17:57:49 2014
@@ -71,6 +71,8 @@ class PingOnlyServiceInstance
         String methodName = "stop";
         logger.info(methodName, sset.getId(), "STOP PING-ONLY INSTANCE");
         state = JobState.Completed;
+        sset.signal(me);
+        sset.removeImplementor(this);
         driver.stop();
         setStopped(true);
     }

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java?rev=1628236&r1=1628235&r2=1628236&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java Mon Sep 29 17:57:49 2014
@@ -1165,6 +1165,13 @@ public class ServiceSet
         }
     }
 
+    void removeImplementor(ServiceInstance si)
+    {
+    	String methodName = "removeImplementor";
+        logger.info(methodName, id, "Removing implementor", si.getId());
+        implementors.remove(si.getId());
+    }
+
     /**
      * This is one of my service instances.  Update its state and maybe kick the
      * state machine as well.