svn commit: r1755968 - /uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java

[degenaro]

Author: degenaro
Date: Thu Aug 11 12:20:53 2016
New Revision: 1755968

URL: http://svn.apache.org/viewvc?rev=1755968&view=rev
Log:
UIMA-5048 DUCC Orchestrator (OR) record Process Manager (PM) Job CommandLine 
requests

Modified:
    
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java

Modified: 
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java?rev=1755968&r1=1755967&r2=1755968&view=diff
==============================================================================
--- 
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
 Thu Aug 11 12:20:53 2016
@@ -360,9 +360,21 @@ implements Orchestrator {
                                if(workMap != null) {
                                        IDuccWork dw = 
workMap.findDuccWork(duccId);
                                        duccEvent.setDw(dw);
+                                       if(dw == null) {
+                                               logger.warn(methodName, duccId, 
"dw==null");
+                                       }
                                }
+                               else {
+                                       logger.warn(methodName, duccId, 
"workMap==null");
+                               }
+                       }
+                       else {
+                               logger.warn(methodName, jobid, "duccId==null");
                        }
                }
+               else {
+                       logger.warn(methodName, jobid, "duccEvent==null");
+               }
                logger.trace(methodName, null, messages.fetch("exit"));
        }
        
@@ -383,8 +395,17 @@ implements Orchestrator {
                        stateManager.reconcileState(dsr);
                        String sid = ""+duccId.getFriendly();
                        DuccWorkJob duccWorkJob = (DuccWorkJob) 
WorkMapHelper.cloneDuccWork(workMap, sid, this, methodName);
-                       IDuccProcessMap processMap = 
duccWorkJob.getProcessMap();
-                       duccEvent.setProcessMap(new DuccProcessMap(processMap));
+                       if(duccWorkJob != null) {
+                               IDuccProcessMap processMap = 
duccWorkJob.getProcessMap();
+                               duccEvent.setProcessMap(new 
DuccProcessMap(processMap));
+                               
+                       }
+                       else {
+                               String text = "not found in map";
+                               duccEvent.setKillDriverReason(text);
+                               logger.warn(methodName, duccId, text);
+                       }
+                       
                }
                logger.trace(methodName, null, messages.fetch("exit"));
        }