2 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/qpid/cluster/Connection.cpp b/cpp/src/qpid/cluster/Connection.cpp
index d4f0a06eaf..f6cccf06a2 100644
--- a/cpp/src/qpid/cluster/Connection.cpp
+++ b/cpp/src/qpid/cluster/Connection.cpp
@@ -95,7 +95,6 @@ Connection::Connection(Cluster& c, sys::ConnectionOutputHandler& out,
     updateIn(c.getUpdateReceiver()),
     secureConnection(0)
 {
-    cluster.addLocalConnection(this);
     if (isLocalClient()) {
         giveReadCredit(cluster.getSettings().readMax); // Flow control
         // Delay adding the connection to the management map until announce()
diff --git a/cpp/src/qpid/cluster/ConnectionCodec.cpp b/cpp/src/qpid/cluster/ConnectionCodec.cpp
index 931cda4893..91ec10903c 100644
--- a/cpp/src/qpid/cluster/ConnectionCodec.cpp
+++ b/cpp/src/qpid/cluster/ConnectionCodec.cpp
@@ -58,6 +58,7 @@ ConnectionCodec::ConnectionCodec(
 ) : codec(out, logId, isLink),
     interceptor(new Connection(cluster, codec, logId, cluster.getId(), catchUp, isLink, external))
 {
+    cluster.addLocalConnection(interceptor);
     std::auto_ptr<sys::ConnectionInputHandler> ih(new ProxyInputHandler(interceptor));
     codec.setInputHandler(ih);
     codec.setVersion(v);