Author: cwiklik
Date: Tue Aug 16 16:57:11 2016
New Revision: 1756533
URL: http://svn.apache.org/viewvc?rev=1756533&view=rev
Log:
UIMA-5048 Fixed NPE when launching Services
Modified:
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/event/AgentEventListener.java
Modified:
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/event/AgentEventListener.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/event/AgentEventListener.java?rev=1756533&r1=1756532&r2=1756533&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/event/AgentEventListener.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/event/AgentEventListener.java
Tue Aug 16 16:57:11 2016
@@ -135,32 +135,22 @@ public class AgentEventListener implemen
// check if this node is a target
for this job's JD
if (
isTargetNodeForProcess(jobDeployment.getJdProcess()) ) {
// agent will check the state
of JD process and either start, stop, or take no action
-// ICommandLine jdCommandLine =
jobDeployment.getJdCmdLine();
agent.reconcileProcessStateAndTakeAction(lifecycleController,
jobDeployment.getJdProcess(), jobDeployment.getJdCmdLine(),
jobDeployment.getStandardInfo(), jobDeployment.getProcessMemoryAssignment(),
jobDeployment.getJobId());
-/*
- if(jdCommandLine != null) {
-
agent.reconcileProcessStateAndTakeAction(lifecycleController,
jobDeployment.getJdProcess(), jobDeployment.getJdCmdLine(),
-
jobDeployment.getStandardInfo(), jobDeployment.getProcessMemoryAssignment(),
jobDeployment.getJobId());
- }
- else {
-
logger.error("onDuccJobsStateEvent", null, "job is service");
- }
-*/
}
- // reconcile JP procees only if JD is OK
- if (
!jobDeployment.getJdProcess().getProcessState().equals(ProcessState.Failed) ) {
- // check JPs
+ // check JPs
+ if ( jobDeployment.getJpProcessList()
!= null ) {
for( IDuccProcess process :
jobDeployment.getJpProcessList() ) {
if (
isTargetNodeForProcess(process) ) {
- // agent will check the state of JP process
and either start, stop, or take no action
+ // agent will check the state of JP
process and either start, stop, or take no action
agent.reconcileProcessStateAndTakeAction(lifecycleController, process,
jobDeployment.getJpCmdLine(),
jobDeployment.getStandardInfo(), jobDeployment.getProcessMemoryAssignment(),
jobDeployment.getJobId());
}
}
+ } else {
+
logger.error("onDuccJobsStateEvent", jobDeployment.getJobId(), "Procss List is
NULL");
}
}
-
}
// received at least one Ducc State
if ( !agent.receivedDuccState ) {
