3 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/qpid/broker/Connection.cpp b/cpp/src/qpid/broker/Connection.cpp
index 5ede40c825..88761533cf 100644
--- a/cpp/src/qpid/broker/Connection.cpp
+++ b/cpp/src/qpid/broker/Connection.cpp
@@ -47,7 +47,7 @@ using qpid::management::Args;
 namespace qpid {
 namespace broker {
 
-    Connection::Connection(ConnectionOutputHandler* out_, Broker& broker_, const Socket& s) :
+Connection::Connection(ConnectionOutputHandler* out_, Broker& broker_, const std::string& mgmtId) :
     broker(broker_),
     outputTasks(*out_),
     out(out_),
@@ -67,7 +67,7 @@ namespace broker {
         if (agent.get () != 0)
         {
             mgmtObject = management::Client::shared_ptr
-                (new management::Client (this, parent, s.getPeerAddress ()));
+                (new management::Client (this, parent, mgmtId));
             agent->addObject (mgmtObject);
         }
     }
diff --git a/cpp/src/qpid/broker/Connection.h b/cpp/src/qpid/broker/Connection.h
index 65ed1d731e..781b2304ec 100644
--- a/cpp/src/qpid/broker/Connection.h
+++ b/cpp/src/qpid/broker/Connection.h
@@ -52,7 +52,7 @@ class Connection : public sys::ConnectionInputHandler,
                    public management::Manageable
 {
   public:
-    Connection(sys::ConnectionOutputHandler* out, Broker& broker, const sys::Socket& s);
+    Connection(sys::ConnectionOutputHandler* out, Broker& broker, const std::string& mgmtId);
     ~Connection ();
 
     /** Get the SessionHandler for channel. Create if it does not already exist */
diff --git a/cpp/src/qpid/broker/ConnectionFactory.cpp b/cpp/src/qpid/broker/ConnectionFactory.cpp
index c925c4be2f..72df9c44e9 100644
--- a/cpp/src/qpid/broker/ConnectionFactory.cpp
+++ b/cpp/src/qpid/broker/ConnectionFactory.cpp
@@ -38,7 +38,7 @@ qpid::sys::ConnectionInputHandler*
 ConnectionFactory::create(qpid::sys::ConnectionOutputHandler* out,
                           const qpid::sys::Socket& s)
 {
-    return new Connection(out, broker, s);
+    return new Connection(out, broker, s.getPeerAddress());
 }
 
 }} // namespace qpid::broker