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:05:06 UTC
svn commit: r1641492 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd:
JobDriver.java fsm/wi/ActionGet.java
Author: degenaro
Date: Mon Nov 24 22:05:06 2014
New Revision: 1641492
URL: http://svn.apache.org/r1641492
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for container (system) code.
JdState advances from Initializing to Active upon first JP Get.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java?rev=1641492&r1=1641491&r2=1641492&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java Mon Nov 24 22:05:06 2014
@@ -81,7 +81,6 @@ public class JobDriver {
cm = new CasManager();
pjdeh = new ProxyJobDriverErrorHandler();
mh = new MessageHandler();
- advanceJdState(JdState.Active);
}
catch(Exception e) {
logger.error(location, ILogger.null_id, e);
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.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/ActionGet.java?rev=1641492&r1=1641491&r2=1641492&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java Mon Nov 24 22:05:06 2014
@@ -33,6 +33,7 @@ import org.apache.uima.ducc.container.jd
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
import org.apache.uima.ducc.container.net.iface.IMetaCas;
import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction;
+import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction.JdState;
public class ActionGet implements IAction {
@@ -54,7 +55,9 @@ public class ActionGet implements IActio
IMetaCasTransaction trans = actionData.getMetaCasTransaction();
IRemoteWorkerIdentity rwi = new RemoteWorkerIdentity(trans);
//
- CasManager cm = JobDriver.getInstance().getCasManager();
+ JobDriver jd = JobDriver.getInstance();
+ jd.advanceJdState(JdState.Active);
+ CasManager cm = jd.getCasManager();
IMetaCas metaCas = cm.getMetaCas();
trans.setMetaCas(metaCas);
//