[jboss-svn-commits] JBL Code SVN: r18737 - in labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss: soa/esb/notification and 1 other directory.

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

Author: mark.little at jboss.com
Date: 2008-03-06 12:30:01 -0500 (Thu, 06 Mar 2008)
New Revision: 18737

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java
Log:
http://jira.jboss.com/jira/browse/JBESB-1554

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java	2008-03-06 17:05:04 UTC (rev 18736)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java	2008-03-06 17:30:01 UTC (rev 18737)
@@ -625,9 +625,16 @@
                                 _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());
-                                _messageConsumer = tSess.createConsumer(topic, _epr
-                                        .getMessageSelector());
+                                Topic topic = null;
+                                 try {
+                                       topic = (Topic) oJndiCtx.lookup(_epr
+                                                                .getDestinationName());
+                                 }
+                                 catch (NamingException ne) {
+                                       topic = tSess.createTopic(_epr.getDestinationName());
+                                 }
+                                      _messageConsumer = tSess.createConsumer(topic, _epr
+                                             .getMessageSelector());
                             } else {
                                 throw new CourierException("Unknown destination type");
                             }

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java	2008-03-06 17:05:04 UTC (rev 18736)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java	2008-03-06 17:30:01 UTC (rev 18737)
@@ -247,7 +247,7 @@
 		    } else if(obj instanceof byte[]) {
 			jmsMessage = sessions[0].createObjectMessage((byte[]) obj);
 		    } else {
-			throw new NotificationException("Expected payload type for '" + MessageType.JAVA_SERIALIZED + "' is byte[].  Recieved '" + obj.getClass().getName() + "'.");
+			throw new NotificationException("Expected payload type for '" + MessageType.JAVA_SERIALIZED + "' is byte[].  Received '" + obj.getClass().getName() + "'.");
 		    }
 		}
 		else