Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 29736 invoked from network); 7 Jan 2007 14:39:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Jan 2007 14:39:03 -0000 Received: (qmail 6435 invoked by uid 500); 7 Jan 2007 14:39:10 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 6416 invoked by uid 500); 7 Jan 2007 14:39:10 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 6407 invoked by uid 99); 7 Jan 2007 14:39:10 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Jan 2007 06:39:10 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Jan 2007 06:39:02 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 3D12B1A981D; Sun, 7 Jan 2007 06:38:04 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r493730 - /incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/expiration/ExpirationTest.cpp Date: Sun, 07 Jan 2007 14:38:04 -0000 To: activemq-commits@geronimo.apache.org From: nmittler@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070107143804.3D12B1A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nmittler Date: Sun Jan 7 06:38:03 2007 New Revision: 493730 URL: http://svn.apache.org/viewvc?view=rev&rev=493730 Log: AMQCPP-28 - Applying patch for memory leak in ExpirationTest Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/expiration/ExpirationTest.cpp Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/expiration/ExpirationTest.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/expiration/ExpirationTest.cpp?view=diff&rev=493730&r1=493729&r2=493730 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/expiration/ExpirationTest.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/expiration/ExpirationTest.cpp Sun Jan 7 06:38:03 2007 @@ -85,6 +85,7 @@ class Producer : public Runnable { private: + ActiveMQConnectionFactory* connectionFactory; Connection* connection; Session* session; Topic* destination; @@ -120,8 +121,7 @@ virtual void run() { try { // Create a ConnectionFactory - ActiveMQConnectionFactory* connectionFactory = new - ActiveMQConnectionFactory("tcp://localhost:61613"); + connectionFactory = new ActiveMQConnectionFactory("tcp://localhost:61613"); // Create a Connection connection = connectionFactory->createConnection(); @@ -188,6 +188,11 @@ if( connection != NULL ) delete connection; }catch ( CMSException& e ) {} connection = NULL; + + try{ + if( connectionFactory != NULL ) delete connectionFactory; + }catch ( CMSException& e ) {} + connectionFactory = NULL; } };