Author: burn
Date: Wed Sep 23 19:04:18 2015
New Revision: 1704914
URL: http://svn.apache.org/viewvc?rev=1704914&view=rev
Log:
UIMA-4576 merge revision 1698346 into this banch
Modified:
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
(contents, props changed)
Modified:
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java?rev=1704914&r1=1704913&r2=1704914&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
(original)
+++
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
Wed Sep 23 19:04:18 2015
@@ -521,8 +521,6 @@ public class StateManager {
String sid = ""+duccId.getFriendly();
DuccWorkJob duccWorkJob = (DuccWorkJob)
WorkMapHelper.findDuccWork(workMap, sid, this, methodName);
if(duccWorkJob != null) {
- addJdUrlToJpCommandLine(duccWorkJob,
jdStatusReport);
- addDeployableToJpCommandLine(duccWorkJob,
jdStatusReport);
//
String jdJmxUrl = jdStatusReport.getJdJmxUrl();
setJdJmxUrl(duccWorkJob, jdJmxUrl);
@@ -561,6 +559,12 @@ public class StateManager {
case Initializing:
switch(duccWorkJob.getJobState()) {
case WaitingForDriver:
+
addJdUrlToJpCommandLine(duccWorkJob, jdStatusReport);
+
addDeployableToJpCommandLine(duccWorkJob, jdStatusReport);
+
if(!duccWorkJob.isJdURLSpecified()) {
+
logger.debug(methodName, duccId, "No JdURL provided yet - still
waitingForDriver");
+ break;
+ }
JobState nextState =
JobState.WaitingForServices;
if(duccWorkJob.getServiceDependencies() == null) {
String message
= messages.fetch("bypass")+" "+nextState;
Propchange:
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Sep 23 19:04:18 2015
@@ -0,0 +1 @@
+/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java:1698346
