commit 8b607b49bf4ceeff981e70b05955f34040e6a99d
author Timothy Bish <tabish121@gmail.com> Tue Jul 14 18:23:34 2015 -0400
committer Timothy Bish <tabish121@gmail.com> Tue Jul 14 18:23:34 2015 -0400
tree 5cadfa2c4d9a9ef2b86b171e175a7927b5e8c504
parent 5b42ee9d36fe94fbdca823305568e536cc48d3ea

https://issues.apache.org/jira/browse/AMQCPP-553

Fix a leak that occurs when consumers are closed but they leave some
audit data in the ConnectionAudit instance..

activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp

diff --git a/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp b/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
index 914b2c2..6bfed72 100644
--- a/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
+++ b/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
@@ -1909,6 +1909,11 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+void ActiveMQConnection::removeAuditedDispatcher(Dispatcher* dispatcher) {
+    this->config->connectionAudit.removeDispatcher(dispatcher);
+}
+
+////////////////////////////////////////////////////////////////////////////////
 void ActiveMQConnection::rollbackDuplicate(Dispatcher* dispatcher, Pointer<commands::Message> message) {
     this->config->connectionAudit.rollbackDuplicate(dispatcher, message);
 }

activemq-cpp/src/main/activemq/core/ActiveMQConnection.h

diff --git a/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h b/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h
index 12fd1d4..727ca69 100644
--- a/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h
+++ b/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h
@@ -260,6 +260,14 @@
          */
         void rollbackDuplicate(Dispatcher* dispatcher, Pointer<commands::Message> message);
 
+        /**
+         * Removes the Audit information stored for a given MessageConsumer
+         *
+         * @param dispatcher
+         *      The Dispatcher instance that has received the Message.
+         */
+        void removeAuditedDispatcher(Dispatcher* dispatcher);
+
     public:   // Connection Interface Methods
 
         /**

activemq-cpp/src/main/activemq/core/ConnectionAudit.cpp

diff --git a/activemq-cpp/src/main/activemq/core/ConnectionAudit.cpp b/activemq-cpp/src/main/activemq/core/ConnectionAudit.cpp
index 40b8cde..d2af6dc 100644
--- a/activemq-cpp/src/main/activemq/core/ConnectionAudit.cpp
+++ b/activemq-cpp/src/main/activemq/core/ConnectionAudit.cpp
@@ -84,7 +84,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 void ConnectionAudit::removeDispatcher(Dispatcher* dispatcher) {
     synchronized(&this->impl->mutex) {
-        this->impl->dispatchers.remove(dispatcher);
+        try {
+            this->impl->dispatchers.remove(dispatcher);
+        } catch (NoSuchElementException& ex) {
+        }
     }
 }
 

activemq-cpp/src/main/activemq/core/kernels/ActiveMQSessionKernel.cpp

diff --git a/activemq-cpp/src/main/activemq/core/kernels/ActiveMQSessionKernel.cpp b/activemq-cpp/src/main/activemq/core/kernels/ActiveMQSessionKernel.cpp
index 949d51b..aaf0a38 100644
--- a/activemq-cpp/src/main/activemq/core/kernels/ActiveMQSessionKernel.cpp
+++ b/activemq-cpp/src/main/activemq/core/kernels/ActiveMQSessionKernel.cpp
@@ -656,7 +656,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::MessageProducer* ActiveMQSessionKernel::createProducer( const cms::Destination* destination ) {
+cms::MessageProducer* ActiveMQSessionKernel::createProducer(const cms::Destination* destination ) {
 
     try {
 
@@ -702,7 +702,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::QueueBrowser* ActiveMQSessionKernel::createBrowser( const cms::Queue* queue ) {
+cms::QueueBrowser* ActiveMQSessionKernel::createBrowser(const cms::Queue* queue ) {
 
     try {
         return ActiveMQSessionKernel::createBrowser(queue, "");
@@ -1271,6 +1271,7 @@
         this->config->consumerLock.writeLock().lock();
         try {
             this->config->consumers.remove(consumer);
+            this->connection->removeAuditedDispatcher(consumer.get());
             this->config->consumerLock.writeLock().unlock();
         } catch (Exception& ex) {
             this->config->consumerLock.writeLock().unlock();