You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2013/07/23 22:34:01 UTC
svn commit: r1506262 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
Author: cwiklik
Date: Tue Jul 23 20:34:01 2013
New Revision: 1506262
URL: http://svn.apache.org/r1506262
Log:
UIMA-3102 fix comparison of incompatible types bug
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=1506262&r1=1506261&r2=1506262&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 Tue Jul 23 20:34:01 2013
@@ -899,9 +899,9 @@ public class NodeAgent extends AbstractD
+ " Was Previously Tagged for Kill While It Was Starting");
undeployProcess(processEntry.getValue());
} else if (deployedProcess.doKill()
- || deployedProcess.getDuccProcess().equals(ProcessState.Stopped)
- || deployedProcess.getDuccProcess().equals(ProcessState.Failed)
- || deployedProcess.getDuccProcess().equals(ProcessState.Killed)) {
+ || deployedProcess.getDuccProcess().getProcessState().equals(ProcessState.Stopped)
+ || deployedProcess.getDuccProcess().getProcessState().equals(ProcessState.Failed)
+ || deployedProcess.getDuccProcess().getProcessState().equals(ProcessState.Killed)) {
// The process has already stopped, but managed to send
// the last update before dying. Ignore the update
return;
@@ -1231,7 +1231,7 @@ public class NodeAgent extends AbstractD
// Agent
// deploy list with no PID we assume it is the one.
String dppid = deployedProcess.getDuccProcess().getPID();
- if (dppid == null || dppid.equals(cpi.getPid())) {
+ if (dppid == null || dppid.equals(String.valueOf(cpi.getPid()))) {
return true;
}
// if (dppid != null && dppid.equals(cpi.getPid())) {