You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2016/10/20 21:51:43 UTC

svn commit: r1765890 - /uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java

Author: degenaro
Date: Thu Oct 20 21:51:43 2016
New Revision: 1765890

URL: http://svn.apache.org/viewvc?rev=1765890&view=rev
Log:
UIMA-5060 DUCC Orchestrator (OR) "warm" restart issues

- fix orchestrator NPE due to shared code path for Service and Job

Modified:
    uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java

Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java?rev=1765890&r1=1765889&r2=1765890&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java Thu Oct 20 21:51:43 2016
@@ -283,8 +283,12 @@ public class StateManager {
 			case Service:
 				DuccWorkJob duccWorkJob = (DuccWorkJob)duccWork;
 				if(duccWorkJob != null) {
-					if(jobDriverTerminated(duccWorkJob)) {
-						OrchestratorHelper.jdDeallocate(duccWorkJob);
+					switch(duccType) {
+					case Job:
+						if(jobDriverTerminated(duccWorkJob)) {
+							OrchestratorHelper.jdDeallocate(duccWorkJob);
+						}
+						break;
 					}
 					if(duccWorkJob.isCompleting() && allProcessesTerminated(duccWorkJob)) {
 						stateJobAccounting.stateChange(duccWorkJob, JobState.Completed);