Author: cwiklik
Date: Fri Feb 5 18:51:54 2016
New Revision: 1728726
URL: http://svn.apache.org/viewvc?rev=1728726&view=rev
Log:
UIMA-4787 Use same code to start Camel route for JP and AP processes
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java?rev=1728726&r1=1728725&r2=1728726&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
Fri Feb 5 18:51:54 2016
@@ -1039,6 +1039,16 @@ public class NodeAgent extends AbstractD
if (addProcessMemoryCollector(duccEvent.getPid())
&& (duccEvent.getState().equals(ProcessState.Initializing)
|| duccEvent
.getState().equals(ProcessState.Running))) {
+ if ( duccEvent.getState().equals(ProcessState.Running) ) {
+ if ( processEntry.getValue().getUimaPipelineComponents() !=
null &&
+
processEntry.getValue().getUimaPipelineComponents().size() > 0 ) {
+ processEntry.getValue().getUimaPipelineComponents().clear();
+ if ( duccEvent.getUimaPipeline() != null ) {
+ duccEvent.getUimaPipeline().clear();
+ }
+ }
+ }
+ /*
RouteBuilder rb = new ProcessMemoryUsageRoute(this,
processEntry.getValue(),
deployedProcess);
super.getContext().addRoutes(rb);
@@ -1073,6 +1083,7 @@ public class NodeAgent extends AbstractD
null,
">>>> Agent Added new Process Memory Collector Thread for
Process:"
+ duccEvent.getPid());
+ */
} else if (duccEvent.getState().equals(ProcessState.Stopped)
|| duccEvent.getState().equals(ProcessState.Failed)
|| duccEvent.getState().equals(ProcessState.Killed)) {
