[jboss-svn-commits] JBL Code SVN: r11548 - labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message.

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

Author: mark.little at jboss.com
Date: 2007-05-01 07:29:23 -0400 (Tue, 01 May 2007)
New Revision: 11548

Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
Log:
http://jira.jboss.com/jira/browse/JBESB-193

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java	2007-05-01 11:26:40 UTC (rev 11547)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java	2007-05-01 11:29:23 UTC (rev 11548)
@@ -389,7 +389,7 @@
 	 * 
 	 * @param message
 	 *            the message to work on.
-	 * @return the FaultTo EPR, or the From EPR, or null, in that order.
+	 * @return the FaultTo EPR, or ReplyTo, or the From EPR, or null, in that order.
 	 */
 
 	private EPR getFaultToAddress(Message message)
@@ -402,7 +402,10 @@
 			if (message.getHeader().getCall().getFaultTo() != null)
 				return message.getHeader().getCall().getFaultTo();
 			else
-				return message.getHeader().getCall().getFrom();
+				if (message.getHeader().getCall().getReplyTo() != null)
+					return message.getHeader().getCall().getReplyTo();
+				else
+					return message.getHeader().getCall().getFrom();
 		}
 		catch (final NullPointerException e)
 		{