Author: astitcher
Date: Thu Jan 21 06:18:28 2010
New Revision: 901552
URL: http://svn.apache.org/viewvc?rev=901552&view=rev
Log:
Remove possible double closing of connection on connect failure
Modified:
qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.cpp?rev=901552&r1=901551&r2=901552&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.cpp Thu Jan 21 06:18:28
2010
@@ -245,13 +245,10 @@
theTimer().add(heartbeatTask);
}
- try {
- handler.waitForOpen();
- } catch (...) {
- // Make sure the connector thread is joined.
- connector->close();
- throw;
- }
+ // If the connect fails then the connector is cleaned up either when we
try to connect again
+ // - in that case in connector.reset() above;
+ // - or when we are deleted
+ handler.waitForOpen();
// If the SASL layer has provided an "operational" userId for the
connection,
// put it in the negotiated settings.
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
