Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 59553 invoked from network); 17 Jun 2007 19:58:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Jun 2007 19:58:55 -0000 Received: (qmail 67645 invoked by uid 500); 17 Jun 2007 19:58:58 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 67589 invoked by uid 500); 17 Jun 2007 19:58:58 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 67580 invoked by uid 99); 17 Jun 2007 19:58:58 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 Jun 2007 12:58:58 -0700 X-ASF-Spam-Status: No, hits=-99.5 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, 17 Jun 2007 12:58:54 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 1EF5E1A981A; Sun, 17 Jun 2007 12:58:34 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r548100 - in /activemq/activemq-cpp/trunk/src/main/activemq/connector: BaseConnectorResource.cpp openwire/OpenWireConnector.cpp Date: Sun, 17 Jun 2007 19:58:33 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070617195834.1EF5E1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tabish Date: Sun Jun 17 12:58:33 2007 New Revision: 548100 URL: http://svn.apache.org/viewvc?view=rev&rev=548100 Log: https://issues.apache.org/activemq/browse/AMQCPP-126 Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/BaseConnectorResource.cpp activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.cpp Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/BaseConnectorResource.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/BaseConnectorResource.cpp?view=diff&rev=548100&r1=548099&r2=548100 ============================================================================== --- activemq/activemq-cpp/trunk/src/main/activemq/connector/BaseConnectorResource.cpp (original) +++ activemq/activemq-cpp/trunk/src/main/activemq/connector/BaseConnectorResource.cpp Sun Jun 17 12:58:33 2007 @@ -51,13 +51,13 @@ return; } + // We are now closed + this->closed = true; + if( connector != NULL ) { // Close the connector resource connector->closeResource( this ); } - - // We are now closed - this->closed = true; // Notify the listeners std::set< ConnectorResourceListener* >::const_iterator iter = Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.cpp?view=diff&rev=548100&r1=548099&r2=548100 ============================================================================== --- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.cpp (original) +++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.cpp Sun Jun 17 12:58:33 2007 @@ -1315,7 +1315,6 @@ disposeOf( dataStructure ); } catch( ConnectorException& ex ) { - delete resource; ex.setMark(__FILE__, __LINE__ ); throw ex; }