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 2014/11/24 23:03:46 UTC
svn commit: r1641491 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator:
StateManager.java WorkMapHelper.java
Author: degenaro
Date: Mon Nov 24 22:03:45 2014
New Revision: 1641491
URL: http://svn.apache.org/r1641491
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for container (system) code.
Find IDuccWork by DuccId (as String).
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/WorkMapHelper.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java?rev=1641491&r1=1641490&r2=1641491&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java Mon Nov 24 22:03:45 2014
@@ -453,7 +453,8 @@ public class StateManager {
synchronized(workMap) {
ts.using();
DuccId duccId = jdStatusReport.getDuccId();
- DuccWorkJob duccWorkJob = (DuccWorkJob) WorkMapHelper.findDuccWork(workMap, duccId, this, methodName);
+ String sid = ""+duccId.getFriendly();
+ DuccWorkJob duccWorkJob = (DuccWorkJob) WorkMapHelper.findDuccWork(workMap, sid, this, methodName);
if(duccWorkJob != null) {
IRationale rationale;
String jdJmxUrl = jdStatusReport.getJdJmxUrl();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/WorkMapHelper.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/WorkMapHelper.java?rev=1641491&r1=1641490&r2=1641491&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/WorkMapHelper.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/WorkMapHelper.java Mon Nov 24 22:03:45 2014
@@ -49,6 +49,17 @@ public class WorkMapHelper {
ts.ended();
}
+ public static IDuccWork findDuccWork(DuccWorkMap workMap, String duccId, Object object, String methodName) {
+ IDuccWork dw = null;
+ TrackSync ts = TrackSync.await(workMap, object.getClass(), methodName);
+ synchronized(workMap) {
+ ts.using();
+ dw = workMap.findDuccWork(duccId);
+ }
+ ts.ended();
+ return dw;
+ }
+
public static IDuccWork findDuccWork(DuccWorkMap workMap, DuccId duccId, Object object, String methodName) {
IDuccWork dw = null;
TrackSync ts = TrackSync.await(workMap, object.getClass(), methodName);