1 files changed, 8 insertions, 2 deletions
diff --git a/cpp/src/qpid/client/ConnectionImpl.cpp b/cpp/src/qpid/client/ConnectionImpl.cpp
index e4e7b2f5c2..4f35639c71 100644
--- a/cpp/src/qpid/client/ConnectionImpl.cpp
+++ b/cpp/src/qpid/client/ConnectionImpl.cpp
@@ -156,8 +156,14 @@ void ConnectionImpl::open()
         handler.setRcvTimeoutTask(heartbeatTask);
         theTimer().add(heartbeatTask);
     }
- 
-    handler.waitForOpen();
+
+    try {
+        handler.waitForOpen();
+    } catch (...) {
+        // Make sure the connector thread is joined.
+        connector->close();
+        throw;
+    }
 
     // If the SASL layer has provided an "operational" userId for the connection,
     // put it in the negotiated settings.