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/11/01 10:50:27 UTC

svn commit: r1537876 - /uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/DriverStatusReport.java

Author: degenaro
Date: Fri Nov  1 09:50:26 2013
New Revision: 1537876

URL: http://svn.apache.org/r1537876
Log:
UIMA-3365 DUCC job driver (JD) Status Report returns incorrect value for method getWorkItemsDispatched()

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/DriverStatusReport.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/DriverStatusReport.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/DriverStatusReport.java?rev=1537876&r1=1537875&r2=1537876&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/DriverStatusReport.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/DriverStatusReport.java Fri Nov  1 09:50:26 2013
@@ -30,12 +30,13 @@ import org.apache.commons.lang.Serializa
 import org.apache.uima.ducc.common.utils.DuccLogger;
 import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
 import org.apache.uima.ducc.common.utils.id.DuccId;
+import org.apache.uima.ducc.transport.event.common.IDuccCompletionType.JobCompletionType;
 import org.apache.uima.ducc.transport.event.common.IDuccPerWorkItemStatistics;
+import org.apache.uima.ducc.transport.event.common.IDuccProcessWorkItems;
 import org.apache.uima.ducc.transport.event.common.IDuccUimaDeploymentDescriptor;
 import org.apache.uima.ducc.transport.event.common.IRationale;
 import org.apache.uima.ducc.transport.event.common.Rationale;
 import org.apache.uima.ducc.transport.event.common.Util;
-import org.apache.uima.ducc.transport.event.common.IDuccCompletionType.JobCompletionType;
 import org.apache.uima.ducc.transport.event.jd.IDriverState.DriverState;
 
 
@@ -501,7 +502,24 @@ public class DriverStatusReport implemen
 	}
 	
 	public int getWorkItemsDispatched() {
-		return getWorkItemsQueued()+getWorkItemsOperating();
+		String methodName = "getWorkItemsDispatched";
+		//return getWorkItemsQueued()+getWorkItemsOperating();
+		//<UIMA-3365>
+		int retVal = 0;
+		try {
+			DuccProcessWorkItemsMap pwiMap = getDuccProcessWorkItemsMap();
+			Iterator<DuccId> iterator = pwiMap.keySet().iterator();
+			while(iterator.hasNext()) {
+				DuccId processId = iterator.next();
+				IDuccProcessWorkItems pwi = pwiMap.get(processId);
+				retVal += pwi.getCountDispatch();
+			}
+		}
+		catch(Throwable t) {
+			duccOut.debug(methodName, duccId, t);
+		}
+		return retVal;
+		//</UIMA-3365>
 	}
 	
 	public void workItemPendingProcessAssignmentAdd(String casId) {