[jboss-svn-commits] JBL Code SVN: r21408 - labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd.

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

Author: kevin.conner at jboss.com
Date: 2008-08-08 05:24:19 -0400 (Fri, 08 Aug 2008)
New Revision: 21408

Modified:
   labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/NewProcessInstanceFacade.java
Log:
Fix replyToOriginator initialisation: JBESB-1921

Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/NewProcessInstanceFacade.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/NewProcessInstanceFacade.java	2008-08-08 07:15:20 UTC (rev 21407)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/NewProcessInstanceFacade.java	2008-08-08 09:24:19 UTC (rev 21408)
@@ -93,11 +93,23 @@
             body.add(Constants.VARIABLE_VALUES, variableMap);
         if (_replyToOriginator) {
             final Call call = message.getHeader().getCall() ;
-            body.add(Constants.REPLY_TO, getEPR(call.getReplyTo())) ;
-            body.add(Constants.FAULT_TO, getEPR(call.getFaultTo())) ;
+            setEPR(body, Constants.REPLY_TO, getEPR(call.getReplyTo())) ;
+            setEPR(body, Constants.FAULT_TO, getEPR(call.getFaultTo())) ;
         }
 	}
 	
+    private void setEPR(final Body body, final String name, final String value)
+    {
+        if (value == null)
+        {
+            body.remove(name) ;
+        }
+        else
+        {
+            body.add(name, value) ;
+        }
+    }
+    
 	private String getEPR(final EPR epr)
 	{
 		if (epr == null) {