3 files changed, 2 insertions, 21 deletions
diff --git a/cpp/src/qpid/client/Connector.cpp b/cpp/src/qpid/client/Connector.cpp
index 946bf0138d..3e77ff2fe0 100644
--- a/cpp/src/qpid/client/Connector.cpp
+++ b/cpp/src/qpid/client/Connector.cpp
@@ -40,7 +40,6 @@
 #include <deque>
 #include <boost/bind.hpp>
 #include <boost/format.hpp>
-#include <boost/weak_ptr.hpp>
 
 namespace qpid {
 namespace client {
@@ -101,7 +100,6 @@ class TCPConnector : public Connector, public sys::Codec
     framing::ProtocolVersion version;
     bool initiated;
     bool closed;
-    bool joined;
 
     sys::ShutdownHandler* shutdownHandler;
     framing::InputHandler* input;
@@ -125,8 +123,6 @@ class TCPConnector : public Connector, public sys::Codec
     void writeDataBlock(const framing::AMQDataBlock& data);
     void eof(qpid::sys::AsynchIO&);
 
-    boost::weak_ptr<ConnectionImpl> impl;
-
     void connect(const std::string& host, int port);
     void init();
     void close();
@@ -180,11 +176,9 @@ TCPConnector::TCPConnector(Poller::shared_ptr p,
       version(ver),
       initiated(false),
       closed(true),
-      joined(true),
       shutdownHandler(0),
       aio(0),
-      poller(p),
-      impl(cimpl->shared_from_this())
+      poller(p)
 {
     QPID_LOG(debug, "TCPConnector created for " << version.toString());
     settings.configureSocket(socket);
@@ -217,10 +211,8 @@ void TCPConnector::connect(const std::string& host, int port){
 
 void TCPConnector::init(){
     Mutex::ScopedLock l(lock);
-    assert(joined);
     ProtocolInitiation init(version);
     writeDataBlock(init);
-    joined = false;
     for (int i = 0; i < 32; i++) {
         aio->queueReadBuffer(new Buff(maxFrameSize));
     }
diff --git a/cpp/src/qpid/client/RdmaConnector.cpp b/cpp/src/qpid/client/RdmaConnector.cpp
index f6bedf63f5..15d6e5364d 100644
--- a/cpp/src/qpid/client/RdmaConnector.cpp
+++ b/cpp/src/qpid/client/RdmaConnector.cpp
@@ -68,7 +68,6 @@ using boost::str;
 
     sys::Mutex pollingLock;
     bool polling;
-    bool joined;
 
     sys::ShutdownHandler* shutdownHandler;
     framing::InputHandler* input;
@@ -148,7 +147,6 @@ RdmaConnector::RdmaConnector(Poller::shared_ptr p,
       version(ver), 
       initiated(false),
       polling(false),
-      joined(true),
       shutdownHandler(0),
       aio(0),
       poller(p),
@@ -164,7 +162,6 @@ 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;
@@ -188,7 +185,6 @@ void RdmaConnector::connect(const std::string& host, int port){
     c->start(poller);
 
     polling = true;
-    joined = false;
 }
 
 // The following only gets run when connected
diff --git a/cpp/src/qpid/client/SslConnector.cpp b/cpp/src/qpid/client/SslConnector.cpp
index 8194371b8a..635de1f62d 100644
--- a/cpp/src/qpid/client/SslConnector.cpp
+++ b/cpp/src/qpid/client/SslConnector.cpp
@@ -89,7 +89,6 @@ class SslConnector : public Connector
 
     sys::Mutex closedLock;
     bool closed;
-    bool joined;
 
     sys::ShutdownHandler* shutdownHandler;
     framing::InputHandler* input;
@@ -115,8 +114,6 @@ class SslConnector : public Connector
 
     std::string identifier;
 
-    ConnectionImpl* impl;
-
     void connect(const std::string& host, int port);
     void init();
     void close();
@@ -174,12 +171,10 @@ SslConnector::SslConnector(Poller::shared_ptr p,
       version(ver), 
       initiated(false),
       closed(true),
-      joined(true),
       shutdownHandler(0),
       writer(maxFrameSize, cimpl),
       aio(0),
-      poller(p),
-      impl(cimpl)
+      poller(p)
 {
     QPID_LOG(debug, "SslConnector created for " << version.toString());
     //TODO: how do we want to handle socket configuration with ssl?
@@ -214,10 +209,8 @@ void SslConnector::connect(const std::string& host, int port){
 
 void SslConnector::init(){
     Mutex::ScopedLock l(closedLock);
-    assert(joined);
     ProtocolInitiation init(version);
     writeDataBlock(init);
-    joined = false;
     for (int i = 0; i < 32; i++) {
         aio->queueReadBuffer(new Buff(maxFrameSize));
     }