1 files changed, 4 insertions, 0 deletions
diff --git a/cpp/src/qpid/client/RdmaConnector.cpp b/cpp/src/qpid/client/RdmaConnector.cpp
index 15d6e5364d..f6bedf63f5 100644
--- a/cpp/src/qpid/client/RdmaConnector.cpp
+++ b/cpp/src/qpid/client/RdmaConnector.cpp
@@ -68,6 +68,7 @@ using boost::str;
 
     sys::Mutex pollingLock;
     bool polling;
+    bool joined;
 
     sys::ShutdownHandler* shutdownHandler;
     framing::InputHandler* input;
@@ -147,6 +148,7 @@ RdmaConnector::RdmaConnector(Poller::shared_ptr p,
       version(ver), 
       initiated(false),
       polling(false),
+      joined(true),
       shutdownHandler(0),
       aio(0),
       poller(p),
@@ -162,6 +164,7 @@ RdmaConnector::~RdmaConnector() {
 void RdmaConnector::connect(const std::string& host, int port){
     Mutex::ScopedLock l(pollingLock);
     assert(!polling);
+    assert(joined);
 
     // This stuff needs to abstracted out of here to a platform specific file
     ::addrinfo *res;
@@ -185,6 +188,7 @@ void RdmaConnector::connect(const std::string& host, int port){
     c->start(poller);
 
     polling = true;
+    joined = false;
 }
 
 // The following only gets run when connected