svn commit: r1739912 - /uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEndAbstract.java

[degenaro]

Author: degenaro
Date: Tue Apr 19 11:53:15 2016
New Revision: 1739912

URL: http://svn.apache.org/viewvc?rev=1739912&view=rev
Log:
UIMA-4902 DUCC Job Driver (JD) add programmability feature to built-in error 
handler

Modified:
    
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEndAbstract.java

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEndAbstract.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEndAbstract.java?rev=1739912&r1=1739911&r2=1739912&view=diff
==============================================================================
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEndAbstract.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEndAbstract.java
 Tue Apr 19 11:53:15 2016
@@ -102,20 +102,17 @@ public abstract class ActionEndAbstract
                        
mb.append(Standardize.Label.isKillProcess.get()+pjdd.isKillProcess());
                        
mb.append(Standardize.Label.isKillWorkItem.get()+pjdd.isKillWorkItem());
                        logger.info(location, ILogger.null_id, mb.toString());
+                       // handle directive == kill job
                        if(pjdd.isKillJob()) {
-                               wisk.error(seqNo);
-                               pStats.error(wi);
                                ActionHelper.killJob(logger, actionData, cm);
-                               ActionHelper.killWorkItem(logger, actionData, 
cm);
                        }
-                       else if(pjdd.isKillProcess()) {
-                               wisk.error(seqNo);
-                               pStats.error(wi);
+                       // handle directive == kill process
+                       if(pjdd.isKillProcess()) {
                                DeallocateReason deallocateReason = 
getDeallocateReason(pjdd);
                                ActionHelper.killProcess(logger, actionData, 
cm, metaCas, wi, deallocateReason);
-                               ActionHelper.killWorkItem(logger, actionData, 
cm);
                        }
-                       else if(pjdd.isKillWorkItem()) {
+                       // handle directive == kill work item
+                       if(pjdd.isKillWorkItem()) {
                                wisk.error(seqNo);
                                pStats.error(wi);
                                ActionHelper.killWorkItem(logger, actionData, 
cm);