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

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

Author: estebanschifman
Date: 2006-11-07 13:56:59 -0500 (Tue, 07 Nov 2006)
New Revision: 7439

Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/CbrProxyAction.java
Log:
Message selector is now in the JMSEpr

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/CbrProxyAction.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/CbrProxyAction.java	2006-11-07 18:55:47 UTC (rev 7438)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/CbrProxyAction.java	2006-11-07 18:56:59 UTC (rev 7439)
@@ -23,6 +23,7 @@
 package org.jboss.soa.esb.actions;
 
 import java.io.Serializable;
+import java.net.URISyntaxException;
 import java.util.Collection;
 import java.util.Iterator;
 
@@ -110,18 +111,34 @@
 				EPR epr = eprIterator.next();
 				Courier courier = CourierFactory.getCourier(epr);
 				//If not successful try the next EPR
-				if (JMSEpr.class.equals(epr.getClass())) {
+				if (epr instanceof JMSEpr) {
 					//Setting the replyTo to the queue we specific in the epr we are going to call
 					//The selectors will do the job.
 					if (message.getHeader().getCall()==null) {
 						Call call = new Call();
 						message.getHeader().setCall(call);
 					}
-					String uniqueReplySelector = jmsQueueReplyListener.getReplySelector();
-					message.getHeader().getCall().setReplyTo(epr);
-					
+
+					JMSEpr jpr = (JMSEpr)epr;
+					JMSEpr replyEpr = null;
+					try
+					{ replyEpr = 
+							new JMSEpr(jpr.getDestinationType()
+									,jpr.getDestinationName()
+									,jpr.getConnectionFactory()
+									,jpr.getJndiType()
+									,jpr.getJndiURL()
+									,jmsQueueReplyListener.getReplySelector()
+									);
+					}
+					catch (URISyntaxException e)
+					{
+						continue;
+					}
+					message.getHeader().getCall().setReplyTo(replyEpr);
+
 					if (courier.deliver(message)) {
-						replyMessage = jmsQueueReplyListener.listen((JMSEpr)epr, uniqueReplySelector);
+						replyMessage = jmsQueueReplyListener.listen(replyEpr);
 						break;
 					} else {
 						_logger.warn("Could not deliver the message, maybe there is another JMS-EPR we can use.");