QPID-1170 - Provide a better factory for creation and deletion of the management agent

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@677408 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 5 deletions

diff --git a/cpp/src/qpid/broker/Link.cpp b/cpp/src/qpid/broker/Link.cpp
index 5c470040e2..9cbf86ebd3 100644
--- a/cpp/src/qpid/broker/Link.cpp
+++ b/cpp/src/qpid/broker/Link.cpp
@@ -59,7 +59,7 @@ Link::Link(LinkRegistry*  _links,
 {
     if (parent != 0)
     {
-        ManagementAgent* agent = ManagementAgent::getAgent();
+        ManagementAgent* agent = ManagementAgent::Singleton::getInstance();
         if (agent != 0)
         {
             mgmtObject = new management::Link(agent, this, parent, _host, _port, _useSsl, _durable);
@@ -264,10 +264,9 @@ void Link::notifyConnectionForced(const string text)
 
 void Link::setPersistenceId(uint64_t id) const
 {
-    if (mgmtObject != 0 && persistenceId == 0)
-    {
-        ManagementAgent* agent = ManagementAgent::getAgent ();
-        agent->addObject (mgmtObject, id);
+    if (mgmtObject != 0 && persistenceId == 0) {
+        ManagementAgent* agent = ManagementAgent::Singleton::getInstance();
+        agent->addObject(mgmtObject, id);
     }
     persistenceId = id;
 }