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 2013/06/04 12:45:38 UTC
svn commit: r1489381 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java
uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/DuccProcessWorkItemsMap.java
Author: degenaro
Date: Tue Jun 4 10:45:37 2013
New Revision: 1489381
URL: http://svn.apache.org/r1489381
Log:
UIMA-2960 DUCC Job Driver (JD) NPE when timeout occurs for queued work item (CAS) for which no JP has been assigned
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/DuccProcessWorkItemsMap.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java?rev=1489381&r1=1489380&r2=1489381&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java Tue Jun 4 10:45:37 2013
@@ -1214,6 +1214,7 @@ public class JobDriver extends Thread im
switch(directive) {
case ProcessContinue_CasNoRetry:
duccOut.info(location, workItem.getJobId(), workItem.getProcessId(), message);
+ workItemStateManager.error(workItem.getSeqNo());
workItemError(workItem, e, directive);
remove(workItem);
casSource.recycle(workItem.getCAS());
@@ -1230,6 +1231,7 @@ public class JobDriver extends Thread im
break;
case ProcessStop_CasNoRetry:
duccOut.info(location, workItem.getJobId(), workItem.getProcessId(), message);
+ workItemStateManager.error(workItem.getSeqNo());
workItemError(workItem, e, directive);
remove(workItem);
casSource.recycle(workItem.getCAS());
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/DuccProcessWorkItemsMap.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/DuccProcessWorkItemsMap.java?rev=1489381&r1=1489380&r2=1489381&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/DuccProcessWorkItemsMap.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/DuccProcessWorkItemsMap.java Tue Jun 4 10:45:37 2013
@@ -45,27 +45,37 @@ public class DuccProcessWorkItemsMap ext
}
public void done(DuccId processId, long time) {
- get(processId).done(time);
getTotals().done(time);
+ if(processId != null) {
+ get(processId).done(time);
+ }
}
public void dispatch(DuccId processId) {
- get(processId).dispatch();
getTotals().dispatch();
+ if(processId != null) {
+ get(processId).dispatch();
+ }
}
public void error(DuccId processId) {
- get(processId).error();
getTotals().error();
+ if(processId != null) {
+ get(processId).error();
+ }
}
public void retry(DuccId processId) {
- get(processId).retry();
getTotals().retry();
+ if(processId != null) {
+ get(processId).retry();
+ }
}
public void preempt(DuccId processId) {
- get(processId).preempt();
getTotals().preempt();
+ if(processId != null) {
+ get(processId).preempt();
+ }
}
}