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 2007/06/17 21:58:33 UTC
svn commit: r548100 - in
/activemq/activemq-cpp/trunk/src/main/activemq/connector:
BaseConnectorResource.cpp openwire/OpenWireConnector.cpp
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;
}