Author: challngr Date: Wed Jul 30 19:16:38 2014 New Revision: 1614744 URL: http://svn.apache.org/r1614744 Log: UIMA-3965 Don't reference a manually stopped service. UIMA-3967 If modified registration value is 'delete', delete the value from the registration.
Modified: 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/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=1614744&r1=1614743&r2=1614744&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 Wed Jul 30 19:16:38 2014 @@ -363,6 +363,10 @@ public class ServiceSet this.independentServices = ind; } + void deleteJobProperty(String k) { + job_props.remove(k); + } + void setJobProperty(String k, String v) { job_props.put(k, v); @@ -941,6 +945,7 @@ public class ServiceSet { String methodName = "reference"; + logger.info(methodName, this.id, "Reference start requested by ", id); if ( excessiveFailures() ) { logger.warn(methodName, this.id, "Reference start fails, excessive failures: init[" + init_failures + "], run[" + run_failures + "]"); return; @@ -959,7 +964,10 @@ public class ServiceSet // Nothing running, so we do referenced start. setReferencedStart(true); - start(registered_instances); + + if ( ! isStopped() ) { + start(registered_instances); + } }