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

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

Author: estebanschifman
Date: 2007-04-14 14:25:07 -0400 (Sat, 14 Apr 2007)
New Revision: 10975

Modified:
   labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/CommandInterpreter.java
Log:
Make CommandInterpreter resilient to null EPRs

Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/CommandInterpreter.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/CommandInterpreter.java	2007-04-13 22:21:03 UTC (rev 10974)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/CommandInterpreter.java	2007-04-14 18:25:07 UTC (rev 10975)
@@ -123,10 +123,15 @@
 		}
 		
 		Message retMsg = _command.toCommandMessage();
-		retMsg.getHeader().getCall().setTo		(message.getHeader().getCall().getTo());
+		EPR toEpr	= message.getHeader().getCall().getTo();
+		if (null!=toEpr)
+			retMsg.getHeader().getCall().setTo(toEpr);
 		EPR replyTo	= message.getHeader().getCall().getReplyTo();
-		retMsg.getHeader().getCall().setReplyTo	(replyTo);
-		retMsg.getHeader().getCall().setFaultTo	(message.getHeader().getCall().getFaultTo());
+		if (null!=replyTo)
+			retMsg.getHeader().getCall().setReplyTo	(replyTo);
+		EPR faultTo	= message.getHeader().getCall().getFaultTo();
+		if (null!=faultTo)
+			retMsg.getHeader().getCall().setFaultTo	(faultTo);
 		return (null==replyTo)? retMsg : defaultReply(retMsg);
 	} // ________________________________