[jboss-svn-commits] JBL Code SVN: r18715 - labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers.

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

Author: beve
Date: 2008-03-06 06:30:38 -0500 (Thu, 06 Mar 2008)
New Revision: 18715

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java
Log:
Work for JBESB-1583 "JMSCourier does not look up Topic from JNDI, instead it tries to create it."


Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java	2008-03-06 08:46:20 UTC (rev 18714)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java	2008-03-06 11:30:38 UTC (rev 18715)
@@ -625,7 +625,14 @@
                                 _messageConsumer = qSess.createReceiver(queue, _epr.getMessageSelector());
                             } else if (JMSEpr.TOPIC_TYPE.equals(sType)) {
                                 TopicSession tSess = (TopicSession) getJmsSession(_epr.getAcknowledgeMode());
-                                Topic topic = tSess.createTopic(_epr.getDestinationName());
+                                Topic topic = null;
+                                try {
+                                    topic = (Topic) oJndiCtx.lookup(_epr.getDestinationName());
+                                } catch (NamingException nex) {
+                                    //ActiveMQ
+                                    topic = tSess.createTopic(_epr.getDestinationName());
+                                }
+                                
                                 _messageConsumer = tSess.createConsumer(topic, _epr
                                         .getMessageSelector());
                             } else {