Author: travis
Date: Fri Jan 25 17:43:56 2013
New Revision: 1438611
URL: http://svn.apache.org/viewvc?rev=1438611&view=rev
Log:
HCATALOG-599 NotificationListener doesn't use getTopic() for sending messages.
Modified:
incubator/hcatalog/trunk/CHANGES.txt
incubator/hcatalog/trunk/server-extensions/src/main/java/org/apache/hcatalog/listener/NotificationListener.java
Modified: incubator/hcatalog/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1438611&r1=1438610&r2=1438611&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Fri Jan 25 17:43:56 2013
@@ -178,6 +178,8 @@ Release 0.5.0 - Unreleased
OPTIMIZATIONS
BUG FIXES
+ HCAT-599 NotificationListener doesn't use getTopic() for sending messages.
(mithun via traviscrawford)
+
HCAT-605 HCatalog release script does not update version in build.properties
(traviscrawford)
HCAT-603 releaseaudit should run before generating artifacts (traviscrawford)
Modified:
incubator/hcatalog/trunk/server-extensions/src/main/java/org/apache/hcatalog/listener/NotificationListener.java
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/server-extensions/src/main/java/org/apache/hcatalog/listener/NotificationListener.java?rev=1438611&r1=1438610&r2=1438611&view=diff
==============================================================================
---
incubator/hcatalog/trunk/server-extensions/src/main/java/org/apache/hcatalog/listener/NotificationListener.java
(original)
+++
incubator/hcatalog/trunk/server-extensions/src/main/java/org/apache/hcatalog/listener/NotificationListener.java
Fri Jan 25 17:43:56 2013
@@ -254,7 +254,6 @@ public class NotificationListener extend
*/
protected void send(HCatEventMessage hCatEventMessage, String topicName) {
try {
- Destination topic = null;
if(null == session){
// this will happen, if we never able to establish a
connection.
createConnection();
@@ -265,17 +264,9 @@ public class NotificationListener extend
return;
}
}
- try{
- // Topics are created on demand. If it doesn't exist on broker
it will
- // be created when broker receives this message.
- topic = session.createTopic(topicName);
- } catch (IllegalStateException ise){
- // this will happen if we were able to establish connection
once, but its no longer valid,
- // ise is thrown, catch it and retry.
- LOG.error("Seems like connection is lost. Retrying", ise);
- createConnection();
- topic = session.createTopic(topicName);
- }
+
+ Destination topic = getTopic(topicName);
+
if (null == topic){
// Still not successful, return from here.
LOG.error("Invalid session. Failed to send message on topic: "
+
