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 2015/06/02 16:40:17 UTC
svn commit: r1683122 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-pm/src/main/java/org/apache/uima/ducc/pm/ProcessManagerComponent.java
Author: degenaro
Date: Tue Jun 2 14:40:16 2015
New Revision: 1683122
URL: http://svn.apache.org/r1683122
Log:
UIMA-4404 DUCC Orchestrator (OR) reduce publication size comprising command line & especially classpath
Fix NPE in ProcessManagerComponent.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-pm/src/main/java/org/apache/uima/ducc/pm/ProcessManagerComponent.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-pm/src/main/java/org/apache/uima/ducc/pm/ProcessManagerComponent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-pm/src/main/java/org/apache/uima/ducc/pm/ProcessManagerComponent.java?rev=1683122&r1=1683121&r2=1683122&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-pm/src/main/java/org/apache/uima/ducc/pm/ProcessManagerComponent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-pm/src/main/java/org/apache/uima/ducc/pm/ProcessManagerComponent.java Tue Jun 2 14:40:16 2015
@@ -40,6 +40,7 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.transport.event.common.DuccUserReservation;
import org.apache.uima.ducc.transport.event.common.DuccWorkJob;
import org.apache.uima.ducc.transport.event.common.DuccWorkPop;
+import org.apache.uima.ducc.transport.event.common.DuccWorkPopDriver;
import org.apache.uima.ducc.transport.event.common.DuccWorkReservation;
import org.apache.uima.ducc.transport.event.common.IDuccJobDeployment;
import org.apache.uima.ducc.transport.event.common.IDuccProcess;
@@ -191,9 +192,12 @@ implements ProcessManager {
logger.debug(methodName, dcj.getDuccId(), "case: Job");
dw = dwHelper.fetch(dcj.getDuccId());
IDuccWorkJob job = (IDuccWorkJob) dw;
- driverCmdLine = job.getDriver().getCommandLine();
+ DuccWorkPopDriver driver = job.getDriver();
+ if(driver != null) {
+ driverCmdLine = driver.getCommandLine();
+ driverProcess = driver.getProcessMap().entrySet().iterator().next().getValue();
+ }
processCmdLine = job.getCommandLine();
- driverProcess = dcj.getDriver().getProcessMap().entrySet().iterator().next().getValue();
break;
case Service:
logger.debug(methodName, dcj.getDuccId(), "case: Service");