[jboss-svn-commits] JBL Code SVN: r17241 - labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers.

[jboss-svn-commits at lists.jboss.org]

Author: kurt.stam at jboss.com
Date: 2007-12-14 12:11:27 -0500 (Fri, 14 Dec 2007)
New Revision: 17241

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java
Log:
JBESB-1301 Fixing null pointer

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java	2007-12-14 17:10:31 UTC (rev 17240)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java	2007-12-14 17:11:27 UTC (rev 17241)
@@ -89,7 +89,11 @@
         JBpmObjectMapper mapper = new JBpmObjectMapper();
     	Message message = mapper.mapFromJBpmToEsbMessage(bpmToEsbVars, globalProcessScope, executionContext);
         //Set the replyTo to the JBpmCallback Service
-        EPR replyTo = createReplyTo(esbToBpmVars.asXML(), globalProcessScope, executionContext);
+        String esbToBpmVarsXml=null;
+        if (esbToBpmVars!=null) {
+            esbToBpmVarsXml = esbToBpmVars.asXML();
+        }
+        EPR replyTo = createReplyTo(esbToBpmVarsXml, globalProcessScope, executionContext);
         message.getHeader().getCall().setReplyTo(replyTo);
         if (exceptionTransition!=null) {
 //          Set the replyTo to the JBpmCallback Service
@@ -138,7 +142,9 @@
     {
         EPR replyTo = new LogicalEPR(ServiceInvoker.INTERNAL_SERVICE_CATEGORY, JBpmCallback.JBPM_CALL_BACK_SERVICE_NAME);
         PortReference portReference = replyTo.getAddr();
-        portReference.addExtension(Constants.ESB_TO_BPM_VARS_TAG, esbToJBpmXml);
+        if (esbToJBpmXml!=null) {
+            portReference.addExtension(Constants.ESB_TO_BPM_VARS_TAG, esbToJBpmXml);
+        }
         if (globalProcessScope!=null) {
             portReference.addExtension(Constants.PROCESS_SCOPE_ATTR, globalProcessScope.toString());
         }