You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2010/05/21 16:03:03 UTC

svn commit: r947011 - in /activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core: ActiveMQConnectionFactory.cpp ActiveMQConnectionFactory.h

Author: tabish
Date: Fri May 21 14:03:03 2010
New Revision: 947011

URL: http://svn.apache.org/viewvc?rev=947011&view=rev
Log:
Fix a memory leak in the factory, related to the changes need for AMQCPP-293

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.h

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.cpp?rev=947011&r1=947010&r2=947011&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.cpp Fri May 21 14:03:03 2010
@@ -81,6 +81,15 @@ ActiveMQConnectionFactory::ActiveMQConne
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+ActiveMQConnectionFactory::~ActiveMQConnectionFactory() {
+    try{
+        delete this->settings;
+    }
+    DECAF_CATCH_NOTHROW( Exception )
+    DECAF_CATCHALL_NOTHROW()
+}
+
+////////////////////////////////////////////////////////////////////////////////
 cms::Connection* ActiveMQConnectionFactory::createConnection()
     throw ( cms::CMSException ) {
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.h?rev=947011&r1=947010&r2=947011&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.h Fri May 21 14:03:03 2010
@@ -47,7 +47,7 @@ namespace core{
                                    const std::string& username = "",
                                    const std::string& password = "" );
 
-        virtual ~ActiveMQConnectionFactory() {}
+        virtual ~ActiveMQConnectionFactory();
 
         /**
          * Creates a connection with the default user identity. The