QPID-4449 - Fixed the API in qpid::management::Manageable to remain backward compatible.

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

34 files changed, 99 insertions, 89 deletions

diff --git a/qpid/cpp/src/posix/QpiddBroker.cpp b/qpid/cpp/src/posix/QpiddBroker.cpp
index a681a6d18d..40857f411f 100644
--- a/qpid/cpp/src/posix/QpiddBroker.cpp
+++ b/qpid/cpp/src/posix/QpiddBroker.cpp
@@ -144,7 +144,7 @@ struct QpiddDaemon : public Daemon {
         uint16_t port=brokerPtr->getPort(options->daemon.transport);
         ready(port);            // Notify parent.
         if (options->parent->broker.enableMgmt && (options->parent->broker.port == 0 || options->daemon.transport != TCP)) {
-            boost::dynamic_pointer_cast<qmf::org::apache::qpid::broker::Broker>(brokerPtr->GetManagementObject())->set_port(port);
+            boost::dynamic_pointer_cast<qmf::org::apache::qpid::broker::Broker>(brokerPtr->GetManagementObjectShared())->set_port(port);
         }
         brokerPtr->run();
     }
@@ -200,7 +200,7 @@ int QpiddBroker::execute (QpiddOptions *options) {
             uint16_t port = brokerPtr->getPort(myOptions->daemon.transport);
             cout << port << endl;
             if (options->broker.enableMgmt) {
-                boost::dynamic_pointer_cast<qmf::org::apache::qpid::broker::Broker>(brokerPtr->GetManagementObject())->set_port(port);
+                boost::dynamic_pointer_cast<qmf::org::apache::qpid::broker::Broker>(brokerPtr->GetManagementObjectShared())->set_port(port);
             }
         }
         brokerPtr->run();
diff --git a/qpid/cpp/src/qpid/acl/Acl.cpp b/qpid/cpp/src/qpid/acl/Acl.cpp
index 61e0b56104..3634c0cdc1 100644
--- a/qpid/cpp/src/qpid/acl/Acl.cpp
+++ b/qpid/cpp/src/qpid/acl/Acl.cpp
@@ -317,7 +317,7 @@ Acl::~Acl(){
     broker->getConnectionObservers().remove(connectionCounter);
 }
 
-ManagementObject::shared_ptr Acl::GetManagementObject(void) const
+ManagementObject::shared_ptr Acl::GetManagementObjectShared(void) const
 {
     return mgmtObject;
 }
diff --git a/qpid/cpp/src/qpid/acl/Acl.h b/qpid/cpp/src/qpid/acl/Acl.h
index ea3c6586a3..8c1a925713 100644
--- a/qpid/cpp/src/qpid/acl/Acl.h
+++ b/qpid/cpp/src/qpid/acl/Acl.h
@@ -117,7 +117,7 @@ private:
     bool readAclFile(std::string& aclFile, std::string& errorText);
     Manageable::status_t lookup       (management::Args& args, std::string& text);
     Manageable::status_t lookupPublish(management::Args& args, std::string& text);
-    virtual qpid::management::ManagementObject::shared_ptr GetManagementObject(void) const;
+    virtual qpid::management::ManagementObject::shared_ptr GetManagementObjectShared(void) const;
     virtual management::Manageable::status_t ManagementMethod (uint32_t methodId, management::Args& args, std::string& text);
 
 };
diff --git a/qpid/cpp/src/qpid/broker/Bridge.cpp b/qpid/cpp/src/qpid/broker/Bridge.cpp
index 4b4954a0df..90cb1a79ed 100644
--- a/qpid/cpp/src/qpid/broker/Bridge.cpp
+++ b/qpid/cpp/src/qpid/broker/Bridge.cpp
@@ -298,7 +298,7 @@ uint32_t Bridge::encodedSize() const
         + 2;              // sync
 }
 
-management::ManagementObject::shared_ptr Bridge::GetManagementObject (void) const
+management::ManagementObject::shared_ptr Bridge::GetManagementObjectShared (void) const
 {
     return mgmtObject;
 }
diff --git a/qpid/cpp/src/qpid/broker/Bridge.h b/qpid/cpp/src/qpid/broker/Bridge.h
index da397b8f77..9f99c9ce01 100644
--- a/qpid/cpp/src/qpid/broker/Bridge.h
+++ b/qpid/cpp/src/qpid/broker/Bridge.h
@@ -73,7 +73,7 @@ class Bridge : public PersistableConfig,
 
     bool isDetached() const { return detached; }
 
-    management::ManagementObject::shared_ptr GetManagementObject() const;
+    management::ManagementObject::shared_ptr GetManagementObjectShared() const;
     management::Manageable::status_t ManagementMethod(uint32_t methodId,
                                                       management::Args& args,
                                                       std::string& text);
diff --git a/qpid/cpp/src/qpid/broker/Broker.cpp b/qpid/cpp/src/qpid/broker/Broker.cpp
index cb93abfac7..292820abe4 100644
--- a/qpid/cpp/src/qpid/broker/Broker.cpp
+++ b/qpid/cpp/src/qpid/broker/Broker.cpp
@@ -234,7 +234,7 @@ Broker::Broker(const Broker::Options& conf) :
         systemObject = System::shared_ptr(system);
 
         mgmtObject = _qmf::Broker::shared_ptr(new _qmf::Broker(managementAgent.get(), this, system, "amqp-broker"));
-        mgmtObject->set_systemRef(system->GetManagementObject()->getObjectId());
+        mgmtObject->set_systemRef(system->GetManagementObjectShared()->getObjectId());
         mgmtObject->set_port(conf.port);
         mgmtObject->set_workerThreads(conf.workerThreads);
         mgmtObject->set_connBacklog(conf.connectionBacklog);
@@ -454,7 +454,7 @@ Broker::~Broker() {
     QPID_LOG(notice, "Shut down");
 }
 
-ManagementObject::shared_ptr Broker::GetManagementObject(void) const
+ManagementObject::shared_ptr Broker::GetManagementObjectShared(void) const
 {
     return mgmtObject;
 }
diff --git a/qpid/cpp/src/qpid/broker/Broker.h b/qpid/cpp/src/qpid/broker/Broker.h
index 0a8f406dbf..eecfd3925c 100644
--- a/qpid/cpp/src/qpid/broker/Broker.h
+++ b/qpid/cpp/src/qpid/broker/Broker.h
@@ -235,7 +235,7 @@ class Broker : public sys::Runnable, public Plugin::Target,
     SessionManager& getSessionManager() { return sessionManager; }
     const std::string& getFederationTag() const { return federationTag; }
 
-    QPID_BROKER_EXTERN management::ManagementObject::shared_ptr GetManagementObject() const;
+    QPID_BROKER_EXTERN management::ManagementObject::shared_ptr GetManagementObjectShared() const;
     QPID_BROKER_EXTERN management::Manageable* GetVhostObject() const;
     QPID_BROKER_EXTERN management::Manageable::status_t ManagementMethod(
         uint32_t methodId, management::Args& args, std::string& text);
diff --git a/qpid/cpp/src/qpid/broker/Connection.cpp b/qpid/cpp/src/qpid/broker/Connection.cpp
index 3cb30a82e3..238bb71fb5 100644
--- a/qpid/cpp/src/qpid/broker/Connection.cpp
+++ b/qpid/cpp/src/qpid/broker/Connection.cpp
@@ -402,7 +402,7 @@ SessionHandler& Connection::getChannel(ChannelId id) {
     return *ptr_map_ptr(i);
 }
 
-ManagementObject::shared_ptr Connection::GetManagementObject(void) const
+ManagementObject::shared_ptr Connection::GetManagementObjectShared(void) const
 {
     return mgmtObject;
 }
diff --git a/qpid/cpp/src/qpid/broker/Connection.h b/qpid/cpp/src/qpid/broker/Connection.h
index 3ef9877750..91470dc3df 100644
--- a/qpid/cpp/src/qpid/broker/Connection.h
+++ b/qpid/cpp/src/qpid/broker/Connection.h
@@ -112,7 +112,7 @@ class Connection : public sys::ConnectionInputHandler,
     void closeChannel(framing::ChannelId channel);
 
     // Manageable entry points
-    management::ManagementObject::shared_ptr GetManagementObject (void) const;
+    management::ManagementObject::shared_ptr GetManagementObjectShared (void) const;
     management::Manageable::status_t
         ManagementMethod (uint32_t methodId, management::Args& args, std::string&);
 
diff --git a/qpid/cpp/src/qpid/broker/Exchange.cpp b/qpid/cpp/src/qpid/broker/Exchange.cpp
index 9098c75f0b..20bd76f645 100644
--- a/qpid/cpp/src/qpid/broker/Exchange.cpp
+++ b/qpid/cpp/src/qpid/broker/Exchange.cpp
@@ -177,7 +177,7 @@ Exchange::Exchange (const string& _name, Manageable* parent, Broker* b) :
             mgmtExchange->set_autoDelete(false);
             agent->addObject(mgmtExchange, 0, durable);
             if (broker)
-                brokerMgmtObject = boost::dynamic_pointer_cast<qmf::org::apache::qpid::broker::Broker>(broker->GetManagementObject());
+                brokerMgmtObject = boost::dynamic_pointer_cast<qmf::org::apache::qpid::broker::Broker>(broker->GetManagementObjectShared());
         }
     }
 }
@@ -198,7 +198,7 @@ Exchange::Exchange(const string& _name, bool _durable, const qpid::framing::Fiel
             mgmtExchange->set_arguments(ManagementAgent::toMap(args));
             agent->addObject(mgmtExchange, 0, durable);
             if (broker)
-                brokerMgmtObject = boost::dynamic_pointer_cast<qmf::org::apache::qpid::broker::Broker>(broker->GetManagementObject());
+                brokerMgmtObject = boost::dynamic_pointer_cast<qmf::org::apache::qpid::broker::Broker>(broker->GetManagementObjectShared());
         }
     }
 
@@ -227,7 +227,7 @@ void Exchange::setAlternate(Exchange::shared_ptr _alternate)
     alternate = _alternate;
     if (mgmtExchange != 0) {
         if (alternate.get() != 0)
-            mgmtExchange->set_altExchange(alternate->GetManagementObject()->getObjectId());
+            mgmtExchange->set_altExchange(alternate->GetManagementObjectShared()->getObjectId());
         else
             mgmtExchange->clr_altExchange();
     }
@@ -294,7 +294,7 @@ void Exchange::recoveryComplete(ExchangeRegistry& exchanges)
     }
 }
 
-ManagementObject::shared_ptr Exchange::GetManagementObject (void) const
+ManagementObject::shared_ptr Exchange::GetManagementObjectShared (void) const
 {
     return mgmtExchange;
 }
@@ -352,7 +352,7 @@ Exchange::Binding::Binding(const string& _key, Queue::shared_ptr _queue, Exchang
 Exchange::Binding::~Binding ()
 {
     if (mgmtBinding != 0) {
-        _qmf::Queue::shared_ptr mo = boost::dynamic_pointer_cast<_qmf::Queue>(queue->GetManagementObject());
+        _qmf::Queue::shared_ptr mo = boost::dynamic_pointer_cast<_qmf::Queue>(queue->GetManagementObjectShared());
         if (mo != 0)
             mo->dec_bindingCount();
         mgmtBinding->resourceDestroy ();
@@ -367,7 +367,7 @@ void Exchange::Binding::startManagement()
         if (broker != 0) {
             ManagementAgent* agent = broker->getManagementAgent();
             if (agent != 0) {
-                _qmf::Queue::shared_ptr mo = boost::dynamic_pointer_cast<_qmf::Queue>(queue->GetManagementObject());
+                _qmf::Queue::shared_ptr mo = boost::dynamic_pointer_cast<_qmf::Queue>(queue->GetManagementObjectShared());
                 if (mo != 0) {
                     management::ObjectId queueId = mo->getObjectId();
 
@@ -383,7 +383,7 @@ void Exchange::Binding::startManagement()
     }
 }
 
-ManagementObject::shared_ptr Exchange::Binding::GetManagementObject () const
+ManagementObject::shared_ptr Exchange::Binding::GetManagementObjectShared () const
 {
     return mgmtBinding;
 }
diff --git a/qpid/cpp/src/qpid/broker/Exchange.h b/qpid/cpp/src/qpid/broker/Exchange.h
index 70ed393f64..ec9a0bea2f 100644
--- a/qpid/cpp/src/qpid/broker/Exchange.h
+++ b/qpid/cpp/src/qpid/broker/Exchange.h
@@ -58,7 +58,7 @@ public:
                 framing::FieldTable args = framing::FieldTable(), const std::string& origin = std::string());
         ~Binding();
         void startManagement();
-        management::ManagementObject::shared_ptr GetManagementObject() const;
+        management::ManagementObject::shared_ptr GetManagementObjectShared() const;
     };
 
 private:
@@ -210,7 +210,7 @@ public:
     static QPID_BROKER_EXTERN Exchange::shared_ptr decode(ExchangeRegistry& exchanges, framing::Buffer& buffer);
 
     // Manageable entry points
-    QPID_BROKER_EXTERN management::ManagementObject::shared_ptr GetManagementObject(void) const;
+    QPID_BROKER_EXTERN management::ManagementObject::shared_ptr GetManagementObjectShared(void) const;
 
     // Federation hooks
     class DynamicBridge {
diff --git a/qpid/cpp/src/qpid/broker/Link.cpp b/qpid/cpp/src/qpid/broker/Link.cpp
index 84a3a9ccb1..db789d79cf 100644
--- a/qpid/cpp/src/qpid/broker/Link.cpp
+++ b/qpid/cpp/src/qpid/broker/Link.cpp
@@ -292,8 +292,8 @@ void Link::opened() {
     Mutex::ScopedLock mutex(lock);
     if (!connection) return;
 
-    if (!hideManagement() && connection->GetManagementObject()) {
-        mgmtObject->set_connectionRef(connection->GetManagementObject()->getObjectId());
+    if (!hideManagement() && connection->GetManagementObjectShared()) {
+        mgmtObject->set_connectionRef(connection->GetManagementObjectShared()->getObjectId());
     }
 
     // Get default URL from known-hosts if not already set
@@ -669,7 +669,7 @@ uint32_t Link::encodedSize() const
         + password.size() + 1;
 }
 
-ManagementObject::shared_ptr Link::GetManagementObject (void) const
+ManagementObject::shared_ptr Link::GetManagementObjectShared (void) const
 {
     return mgmtObject;
 }
diff --git a/qpid/cpp/src/qpid/broker/Link.h b/qpid/cpp/src/qpid/broker/Link.h
index 97511de08f..2087b5259c 100644
--- a/qpid/cpp/src/qpid/broker/Link.h
+++ b/qpid/cpp/src/qpid/broker/Link.h
@@ -183,7 +183,7 @@ class Link : public PersistableConfig, public management::Manageable {
     static bool isEncodedLink(const std::string& key);
 
     // Manageable entry points
-    management::ManagementObject::shared_ptr GetManagementObject(void) const;
+    management::ManagementObject::shared_ptr GetManagementObjectShared(void) const;
     management::Manageable::status_t ManagementMethod(uint32_t, management::Args&, std::string&);
 
     // manage the exchange owned by this link
diff --git a/qpid/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp
index eb72db3a7b..271e8476f9 100644
--- a/qpid/cpp/src/qpid/broker/Queue.cpp
+++ b/qpid/cpp/src/qpid/broker/Queue.cpp
@@ -198,7 +198,7 @@ Queue::Queue(const string& _name, const QueueSettings& _settings,
                 new _qmf::Queue(agent, this, parent, _name, _store != 0, settings.autodelete));
             mgmtObject->set_arguments(settings.asMap());
             agent->addObject(mgmtObject, 0, store != 0);
-            brokerMgmtObject = boost::dynamic_pointer_cast<_qmf::Broker>(broker->GetManagementObject());
+            brokerMgmtObject = boost::dynamic_pointer_cast<_qmf::Broker>(broker->GetManagementObjectShared());
             if (brokerMgmtObject)
                 brokerMgmtObject->inc_queueCount();
         }
@@ -1108,7 +1108,7 @@ void Queue::setPersistenceId(uint64_t _persistenceId) const
 {
     if (mgmtObject != 0 && persistenceId == 0 && externalQueueStore)
     {
-        ManagementObject::shared_ptr childObj = externalQueueStore->GetManagementObject();
+        ManagementObject::shared_ptr childObj = externalQueueStore->GetManagementObjectShared();
         if (childObj != 0)
             childObj->setReference(mgmtObject->getObjectId());
     }
@@ -1154,7 +1154,7 @@ void Queue::setAlternateExchange(boost::shared_ptr<Exchange> exchange)
     alternateExchange = exchange;
     if (mgmtObject) {
         if (exchange.get() != 0)
-            mgmtObject->set_altExchange(exchange->GetManagementObject()->getObjectId());
+            mgmtObject->set_altExchange(exchange->GetManagementObjectShared()->getObjectId());
         else
             mgmtObject->clr_altExchange();
     }
@@ -1258,7 +1258,7 @@ void Queue::setExternalQueueStore(ExternalQueueStore* inst) {
     externalQueueStore = inst;
 
     if (inst) {
-        ManagementObject::shared_ptr childObj = inst->GetManagementObject();
+        ManagementObject::shared_ptr childObj = inst->GetManagementObjectShared();
         if (childObj != 0 && mgmtObject != 0)
             childObj->setReference(mgmtObject->getObjectId());
     }
@@ -1306,7 +1306,7 @@ void Queue::countLoadedFromDisk(uint64_t size) const
 }
 
 
-ManagementObject::shared_ptr Queue::GetManagementObject (void) const
+ManagementObject::shared_ptr Queue::GetManagementObjectShared (void) const
 {
     return mgmtObject;
 }
diff --git a/qpid/cpp/src/qpid/broker/Queue.h b/qpid/cpp/src/qpid/broker/Queue.h
index 3a668276e8..25cefd144d 100644
--- a/qpid/cpp/src/qpid/broker/Queue.h
+++ b/qpid/cpp/src/qpid/broker/Queue.h
@@ -340,7 +340,7 @@ class Queue : public boost::enable_shared_from_this<Queue>,
     QPID_BROKER_EXTERN void countLoadedFromDisk(uint64_t size) const;
 
     // Manageable entry points
-    QPID_BROKER_EXTERN management::ManagementObject::shared_ptr GetManagementObject (void) const;
+    QPID_BROKER_EXTERN management::ManagementObject::shared_ptr GetManagementObjectShared (void) const;
     management::Manageable::status_t
     QPID_BROKER_EXTERN ManagementMethod (uint32_t methodId, management::Args& args, std::string& text);
     QPID_BROKER_EXTERN void query(::qpid::types::Variant::Map&) const;
diff --git a/qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp b/qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp
index 944cc7e838..9d6053669b 100644
--- a/qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp
@@ -78,7 +78,7 @@ QueueFlowLimit::QueueFlowLimit(Queue *_queue,
         if (queue->getSettings().maxDepth.hasCount()) maxCount = queue->getSettings().maxDepth.getCount();
         if (queue->getSettings().maxDepth.hasCount()) maxSize = queue->getSettings().maxDepth.getSize();
         broker = queue->getBroker();
-        queueMgmtObj = boost::dynamic_pointer_cast<_qmfBroker::Queue> (queue->GetManagementObject());
+        queueMgmtObj = boost::dynamic_pointer_cast<_qmfBroker::Queue> (queue->GetManagementObjectShared());
         if (queueMgmtObj) {
             queueMgmtObj->set_flowStopped(isFlowControlActive());
         }
diff --git a/qpid/cpp/src/qpid/broker/SemanticState.cpp b/qpid/cpp/src/qpid/broker/SemanticState.cpp
index 6e42f8d746..4a3f31a7c0 100644
--- a/qpid/cpp/src/qpid/broker/SemanticState.cpp
+++ b/qpid/cpp/src/qpid/broker/SemanticState.cpp
@@ -303,14 +303,14 @@ Consumer(_name, type),
     deliveryCount(0),
     protocols(parent->getSession().getBroker().getProtocolRegistry())
 {
-    if (parent != 0 && queue.get() != 0 && queue->GetManagementObject() !=0)
+    if (parent != 0 && queue.get() != 0 && queue->GetManagementObjectShared() !=0)
     {
         ManagementAgent* agent = parent->session.getBroker().getManagementAgent();
         qpid::management::Manageable* ms = dynamic_cast<qpid::management::Manageable*> (&(parent->session));
 
         if (agent != 0)
         {
-            mgmtObject = _qmf::Subscription::shared_ptr(new _qmf::Subscription(agent, this, ms , queue->GetManagementObject()->getObjectId(), getTag(),
+            mgmtObject = _qmf::Subscription::shared_ptr(new _qmf::Subscription(agent, this, ms , queue->GetManagementObjectShared()->getObjectId(), getTag(),
                                                                                !acquire, ackExpected, exclusive, ManagementAgent::toMap(arguments)));
             agent->addObject (mgmtObject);
             mgmtObject->set_creditMode("WINDOW");
@@ -318,7 +318,7 @@ Consumer(_name, type),
     }
 }
 
-ManagementObject::shared_ptr SemanticState::ConsumerImpl::GetManagementObject (void) const
+ManagementObject::shared_ptr SemanticState::ConsumerImpl::GetManagementObjectShared (void) const
 {
     return mgmtObject;
 }
diff --git a/qpid/cpp/src/qpid/broker/SemanticState.h b/qpid/cpp/src/qpid/broker/SemanticState.h
index be7c8d490a..afb527b0f5 100644
--- a/qpid/cpp/src/qpid/broker/SemanticState.h
+++ b/qpid/cpp/src/qpid/broker/SemanticState.h
@@ -163,7 +163,7 @@ class SemanticState : private boost::noncopyable {
 
         // manageable entry points
         QPID_BROKER_EXTERN management::ManagementObject::shared_ptr
-        GetManagementObject(void) const;
+        GetManagementObjectShared(void) const;
 
         QPID_BROKER_EXTERN management::Manageable::status_t
         ManagementMethod(uint32_t methodId, management::Args& args, std::string& text);
diff --git a/qpid/cpp/src/qpid/broker/SessionState.cpp b/qpid/cpp/src/qpid/broker/SessionState.cpp
index 42be45f7ce..f48bf653fb 100644
--- a/qpid/cpp/src/qpid/broker/SessionState.cpp
+++ b/qpid/cpp/src/qpid/broker/SessionState.cpp
@@ -65,7 +65,7 @@ SessionState::SessionState(
 }
 
 void SessionState::addManagementObject() {
-    if (GetManagementObject()) return; // Already added.
+    if (GetManagementObjectShared()) return; // Already added.
     Manageable* parent = broker.GetVhostObject ();
     if (parent != 0) {
         ManagementAgent* agent = getBroker().getManagementAgent();
@@ -127,7 +127,7 @@ void SessionState::attach(SessionHandler& h) {
     if (mgmtObject != 0)
     {
         mgmtObject->set_attached (1);
-        mgmtObject->set_connectionRef (h.getConnection().GetManagementObject()->getObjectId());
+        mgmtObject->set_connectionRef (h.getConnection().GetManagementObjectShared()->getObjectId());
         mgmtObject->set_channelId (h.getChannel());
     }
     asyncCommandCompleter->attached();
@@ -148,7 +148,7 @@ void SessionState::giveReadCredit(int32_t credit) {
         getConnection().outputTasks.giveReadCredit(credit);
 }
 
-ManagementObject::shared_ptr SessionState::GetManagementObject (void) const
+ManagementObject::shared_ptr SessionState::GetManagementObjectShared (void) const
 {
     return mgmtObject;
 }
diff --git a/qpid/cpp/src/qpid/broker/SessionState.h b/qpid/cpp/src/qpid/broker/SessionState.h
index af384ff761..06643fdbef 100644
--- a/qpid/cpp/src/qpid/broker/SessionState.h
+++ b/qpid/cpp/src/qpid/broker/SessionState.h
@@ -110,7 +110,7 @@ class SessionState : public qpid::SessionState,
                        const qpid::types::Variant::Map& annotations, bool sync);
 
     // Manageable entry points
-    management::ManagementObject::shared_ptr GetManagementObject (void) const;
+    management::ManagementObject::shared_ptr GetManagementObjectShared (void) const;
     management::Manageable::status_t
     ManagementMethod (uint32_t methodId, management::Args& args, std::string&);
 
diff --git a/qpid/cpp/src/qpid/broker/System.h b/qpid/cpp/src/qpid/broker/System.h
index 591d2a14a6..179a3275a7 100644
--- a/qpid/cpp/src/qpid/broker/System.h
+++ b/qpid/cpp/src/qpid/broker/System.h
@@ -45,7 +45,7 @@ class System : public management::Manageable
 
     System (std::string _dataDir, Broker* broker = 0);
 
-    management::ManagementObject::shared_ptr GetManagementObject (void) const
+    management::ManagementObject::shared_ptr GetManagementObjectShared (void) const
     { return mgmtObject; }
 
 
diff --git a/qpid/cpp/src/qpid/broker/Vhost.h b/qpid/cpp/src/qpid/broker/Vhost.h
index 599b821870..c4b1c280e1 100644
--- a/qpid/cpp/src/qpid/broker/Vhost.h
+++ b/qpid/cpp/src/qpid/broker/Vhost.h
@@ -40,7 +40,7 @@ class Vhost : public management::Manageable
 
     Vhost (management::Manageable* parentBroker, Broker* broker = 0);
 
-    management::ManagementObject::shared_ptr GetManagementObject (void) const
+    management::ManagementObject::shared_ptr GetManagementObjectShared (void) const
     { return mgmtObject; }
     void setFederationTag(const std::string& tag);
 };
diff --git a/qpid/cpp/src/qpid/broker/amqp/ManagedConnection.cpp b/qpid/cpp/src/qpid/broker/amqp/ManagedConnection.cpp
index 0253ba5552..8daf860f8e 100644
--- a/qpid/cpp/src/qpid/broker/amqp/ManagedConnection.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedConnection.cpp
@@ -73,7 +73,7 @@ void ManagedConnection::setSaslSsf(int ssf)
     connection->set_saslSsf(ssf);
 }
 
-qpid::management::ManagementObject::shared_ptr ManagedConnection::GetManagementObject() const
+qpid::management::ManagementObject::shared_ptr ManagedConnection::GetManagementObjectShared() const
 {
     return connection;
 }
diff --git a/qpid/cpp/src/qpid/broker/amqp/ManagedConnection.h b/qpid/cpp/src/qpid/broker/amqp/ManagedConnection.h
index e2d0376918..f1514d11c5 100644
--- a/qpid/cpp/src/qpid/broker/amqp/ManagedConnection.h
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedConnection.h
@@ -44,7 +44,7 @@ class ManagedConnection : public qpid::management::Manageable, public Connection
     std::string getUserid() const;
     void setSaslMechanism(const std::string&);
     void setSaslSsf(int);
-    qpid::management::ManagementObject::shared_ptr GetManagementObject() const;
+    qpid::management::ManagementObject::shared_ptr GetManagementObjectShared() const;
     bool isLocal(const ConnectionToken* t) const;
     void incomingMessageReceived();
     void outgoingMessageSent();
diff --git a/qpid/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.cpp b/qpid/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.cpp
index f36a1e8da4..0fe20f68ab 100644
--- a/qpid/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.cpp
@@ -37,7 +37,7 @@ ManagedOutgoingLink::ManagedOutgoingLink(Broker& broker, Queue& q, ManagedSessio
 {
     qpid::management::ManagementAgent* agent = broker.getManagementAgent();
     if (agent) {
-        subscription = _qmf::Subscription::shared_ptr(new _qmf::Subscription(agent, this, &p, q.GetManagementObject()->getObjectId(), id,
+        subscription = _qmf::Subscription::shared_ptr(new _qmf::Subscription(agent, this, &p, q.GetManagementObjectShared()->getObjectId(), id,
                                                            false/*FIXME*/, true/*FIXME*/, topic, qpid::types::Variant::Map()));
         agent->addObject(subscription);
         subscription->set_creditMode("n/a");
@@ -48,7 +48,7 @@ ManagedOutgoingLink::~ManagedOutgoingLink()
     if (subscription != 0) subscription->resourceDestroy();
 }
 
-qpid::management::ManagementObject::shared_ptr ManagedOutgoingLink::GetManagementObject() const
+qpid::management::ManagementObject::shared_ptr ManagedOutgoingLink::GetManagementObjectShared() const
 {
     return subscription;
 }
diff --git a/qpid/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.h b/qpid/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.h
index 20a1095db2..19667da698 100644
--- a/qpid/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.h
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.h
@@ -39,7 +39,7 @@ class ManagedOutgoingLink : public qpid::management::Manageable
   public:
     ManagedOutgoingLink(Broker& broker, Queue&, ManagedSession& parent, const std::string id, bool topic);
     virtual ~ManagedOutgoingLink();
-    qpid::management::ManagementObject::shared_ptr GetManagementObject() const;
+    qpid::management::ManagementObject::shared_ptr GetManagementObjectShared() const;
     void outgoingMessageSent();
     void outgoingMessageAccepted();
     void outgoingMessageRejected();
diff --git a/qpid/cpp/src/qpid/broker/amqp/ManagedSession.cpp b/qpid/cpp/src/qpid/broker/amqp/ManagedSession.cpp
index 9bef0e842b..f1c4940118 100644
--- a/qpid/cpp/src/qpid/broker/amqp/ManagedSession.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedSession.cpp
@@ -38,7 +38,7 @@ ManagedSession::ManagedSession(Broker& broker, ManagedConnection& p, const std::
         session->set_attached(true);
         session->set_detachedLifespan(0);
         session->clr_expireTime();
-        session->set_connectionRef(parent.GetManagementObject()->getObjectId());
+        session->set_connectionRef(parent.GetManagementObjectShared()->getObjectId());
         agent->addObject(session);
     }
 }
@@ -48,7 +48,7 @@ ManagedSession::~ManagedSession()
     if (session) session->resourceDestroy();
 }
 
-qpid::management::ManagementObject::shared_ptr ManagedSession::GetManagementObject() const
+qpid::management::ManagementObject::shared_ptr ManagedSession::GetManagementObjectShared() const
 {
     return session;
 }
diff --git a/qpid/cpp/src/qpid/broker/amqp/ManagedSession.h b/qpid/cpp/src/qpid/broker/amqp/ManagedSession.h
index 1f56964bb6..2f62c8705a 100644
--- a/qpid/cpp/src/qpid/broker/amqp/ManagedSession.h
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedSession.h
@@ -40,7 +40,7 @@ class ManagedSession : public qpid::management::Manageable, public OwnershipToke
   public:
     ManagedSession(Broker& broker, ManagedConnection& parent, const std::string id);
     virtual ~ManagedSession();
-    qpid::management::ManagementObject::shared_ptr GetManagementObject() const;
+    qpid::management::ManagementObject::shared_ptr GetManagementObjectShared() const;
     bool isLocal(const ConnectionToken* t) const;
     void incomingMessageReceived();
     void incomingMessageAccepted();
diff --git a/qpid/cpp/src/qpid/ha/HaBroker.h b/qpid/cpp/src/qpid/ha/HaBroker.h
index 530211ced4..4b3f1d49c1 100644
--- a/qpid/cpp/src/qpid/ha/HaBroker.h
+++ b/qpid/cpp/src/qpid/ha/HaBroker.h
@@ -71,7 +71,7 @@ class HaBroker : public management::Manageable
     void initialize();
 
     // Implement Manageable.
-    qpid::management::ManagementObject::shared_ptr GetManagementObject() const { return mgmtObject; }
+    qpid::management::ManagementObject::shared_ptr GetManagementObjectShared() const { return mgmtObject; }
     management::Manageable::status_t ManagementMethod (
         uint32_t methodId, management::Args& args, std::string& text);
 
diff --git a/qpid/cpp/src/qpid/management/Manageable.cpp b/qpid/cpp/src/qpid/management/Manageable.cpp
index 651215ffb5..322ec16656 100644
--- a/qpid/cpp/src/qpid/management/Manageable.cpp
+++ b/qpid/cpp/src/qpid/management/Manageable.cpp
@@ -41,6 +41,16 @@ string Manageable::StatusText (status_t status, string text)
     return "??";
 }
 
+ManagementObject* Manageable::GetManagementObject(void) const
+{
+    return 0;
+}
+
+ManagementObject::shared_ptr Manageable::GetManagementObjectShared() const
+{
+    return ManagementObject::shared_ptr();
+}
+
 Manageable::status_t Manageable::ManagementMethod (uint32_t, Args&, std::string&)
 {
     return STATUS_UNKNOWN_METHOD;
diff --git a/qpid/cpp/src/qpid/management/ManagementAgent.cpp b/qpid/cpp/src/qpid/management/ManagementAgent.cpp
index 7b8808c0a0..3f647ba052 100644
--- a/qpid/cpp/src/qpid/management/ManagementAgent.cpp
+++ b/qpid/cpp/src/qpid/management/ManagementAgent.cpp
@@ -698,7 +698,7 @@ void ManagementAgent::periodicProcessing (void)
     //
     if (publish) {
         uint64_t uptime = sys::Duration(startTime, sys::now());
-        boost::dynamic_pointer_cast<_qmf::Broker>(broker->GetManagementObject())->set_uptime(uptime);
+        boost::dynamic_pointer_cast<_qmf::Broker>(broker->GetManagementObjectShared())->set_uptime(uptime);
         qpid::sys::MemStat::loadMemInfo(memstat.get());
     }
 
@@ -1722,7 +1722,7 @@ void ManagementAgent::handleAttachRequest (Buffer& inBuffer, const string& reply
     string   label;
     uint32_t requestedBrokerBank, requestedAgentBank;
     uint32_t assignedBank;
-    ObjectId connectionRef = ((const ConnectionState*) connToken)->GetManagementObject()->getObjectId();
+    ObjectId connectionRef = ((const ConnectionState*) connToken)->GetManagementObjectShared()->getObjectId();
     Uuid     systemId;
 
     moveNewObjects();
@@ -1754,7 +1754,7 @@ void ManagementAgent::handleAttachRequest (Buffer& inBuffer, const string& reply
     agent->mgmtObject = _qmf::Agent::shared_ptr(new _qmf::Agent (this, agent.get()));
     agent->mgmtObject->set_connectionRef(agent->connectionRef);
     agent->mgmtObject->set_label        (label);
-    agent->mgmtObject->set_registeredTo (broker->GetManagementObject()->getObjectId());
+    agent->mgmtObject->set_registeredTo (broker->GetManagementObjectShared()->getObjectId());
     agent->mgmtObject->set_systemId     ((const unsigned char*)systemId.data());
     agent->mgmtObject->set_brokerBank   (brokerBank);
     agent->mgmtObject->set_agentBank    (assignedBank);
@@ -1831,7 +1831,7 @@ void ManagementAgent::handleGetQuery(Buffer& inBuffer, const string& replyToKey,
 
     if (className == "broker") {
         uint64_t uptime = sys::Duration(startTime, sys::now());
-        boost::dynamic_pointer_cast<_qmf::Broker>(broker->GetManagementObject())->set_uptime(uptime);
+        boost::dynamic_pointer_cast<_qmf::Broker>(broker->GetManagementObjectShared())->set_uptime(uptime);
     }
 
 
@@ -1945,7 +1945,7 @@ void ManagementAgent::handleGetQuery(const string& body, const string& rte, cons
 
     if (className == "broker") {
         uint64_t uptime = sys::Duration(startTime, sys::now());
-        boost::dynamic_pointer_cast<_qmf::Broker>(broker->GetManagementObject())->set_uptime(uptime);
+        boost::dynamic_pointer_cast<_qmf::Broker>(broker->GetManagementObjectShared())->set_uptime(uptime);
     }
 
     /*
diff --git a/qpid/cpp/src/qpid/management/ManagementAgent.h b/qpid/cpp/src/qpid/management/ManagementAgent.h
index 7f1a2e3e66..9df5825e32 100644
--- a/qpid/cpp/src/qpid/management/ManagementAgent.h
+++ b/qpid/cpp/src/qpid/management/ManagementAgent.h
@@ -211,7 +211,7 @@ private:
         ObjectId          connectionRef;
         qmf::org::apache::qpid::broker::Agent::shared_ptr mgmtObject;
         RemoteAgent(ManagementAgent& _agent) : agent(_agent) {}
-        ManagementObject::shared_ptr GetManagementObject (void) const { return mgmtObject; }
+        ManagementObject::shared_ptr GetManagementObjectShared (void) const { return mgmtObject; }
 
         virtual ~RemoteAgent ();
         void mapEncode(qpid::types::Variant::Map& _map) const;
diff --git a/qpid/cpp/src/tests/BrokerMgmtAgent.cpp b/qpid/cpp/src/tests/BrokerMgmtAgent.cpp
index 9c21e51a18..71e1945d94 100644
--- a/qpid/cpp/src/tests/BrokerMgmtAgent.cpp
+++ b/qpid/cpp/src/tests/BrokerMgmtAgent.cpp
@@ -123,7 +123,7 @@ class TestManageable : public qpid::management::Manageable
         mgmtObj = tmp;
     };
     ~TestManageable() { mgmtObj.reset(); }
-    management::ManagementObject::shared_ptr GetManagementObject() const { return mgmtObj; };
+    management::ManagementObject::shared_ptr GetManagementObjectShared() const { return mgmtObj; };
     static void validateTestObjectProperties(_qmf::TestObject& to)
     {
         // verify the default values are as expected.  We don't check 'string1',
@@ -209,11 +209,11 @@ QPID_AUTO_TEST_CASE(v1ObjPublish)
 
     // create a manageable test object
     TestManageable *tm = new TestManageable(agent, std::string("obj1"));
-    uint32_t objLen = tm->GetManagementObject()->writePropertiesSize();
+    uint32_t objLen = tm->GetManagementObjectShared()->writePropertiesSize();
 
     Receiver r1 = fix->createV1DataIndRcvr("org.apache.qpid.broker.mgmt.test", "#");
 
-    agent->addObject(tm->GetManagementObject(), 1);
+    agent->addObject(tm->GetManagementObjectShared(), 1);
 
     // wait for the object to be published
     Message m1;
@@ -234,7 +234,7 @@ QPID_AUTO_TEST_CASE(v1ObjPublish)
 
     // destroy the object
 
-    tm->GetManagementObject()->resourceDestroy();
+    tm->GetManagementObjectShared()->resourceDestroy();
 
     // wait for the deleted object to be published
 
@@ -272,9 +272,9 @@ QPID_AUTO_TEST_CASE(v2ObjPublish)
 
     TestManageable *tm = new TestManageable(agent, std::string("obj2"));
 
-    Receiver r1 = fix->createV2DataIndRcvr(tm->GetManagementObject()->getPackageName(), "#");
+    Receiver r1 = fix->createV2DataIndRcvr(tm->GetManagementObjectShared()->getPackageName(), "#");
 
-    agent->addObject(tm->GetManagementObject(), "testobj-1");
+    agent->addObject(tm->GetManagementObjectShared(), "testobj-1");
 
     // wait for the object to be published
     Message m1;
@@ -295,7 +295,7 @@ QPID_AUTO_TEST_CASE(v2ObjPublish)
 
     // destroy the object
 
-    tm->GetManagementObject()->resourceDestroy();
+    tm->GetManagementObjectShared()->resourceDestroy();
 
     // wait for the deleted object to be published
 
@@ -335,11 +335,11 @@ QPID_AUTO_TEST_CASE(v1ExportDelObj)
 
     // create a manageable test object
     TestManageable *tm = new TestManageable(agent, std::string("myObj"));
-    uint32_t objLen = tm->GetManagementObject()->writePropertiesSize();
+    uint32_t objLen = tm->GetManagementObjectShared()->writePropertiesSize();
 
     Receiver r1 = fix->createV1DataIndRcvr("org.apache.qpid.broker.mgmt.test", "#");
 
-    agent->addObject(tm->GetManagementObject(), 1);
+    agent->addObject(tm->GetManagementObjectShared(), 1);
 
     // wait for the object to be published
     Message m1;
@@ -352,7 +352,7 @@ QPID_AUTO_TEST_CASE(v1ExportDelObj)
     // destroy the object, then immediately export (before the next poll cycle)
 
     ::qpid::management::ManagementAgent::DeletedObjectList delObjs;
-    tm->GetManagementObject()->resourceDestroy();
+    tm->GetManagementObjectShared()->resourceDestroy();
     agent->exportDeletedObjects( delObjs );
     BOOST_CHECK(delObjs.size() == 1);
 
@@ -399,11 +399,11 @@ QPID_AUTO_TEST_CASE(v1ImportDelObj)
 
     // create a manageable test object
     TestManageable *tm = new TestManageable(agent, std::string("anObj"));
-    uint32_t objLen = tm->GetManagementObject()->writePropertiesSize();
+    uint32_t objLen = tm->GetManagementObjectShared()->writePropertiesSize();
 
     Receiver r1 = fix->createV1DataIndRcvr("org.apache.qpid.broker.mgmt.test", "#");
 
-    agent->addObject(tm->GetManagementObject(), 1);
+    agent->addObject(tm->GetManagementObjectShared(), 1);
 
     // wait for the object to be published
     Message m1;
@@ -416,7 +416,7 @@ QPID_AUTO_TEST_CASE(v1ImportDelObj)
     // destroy the object, then immediately export (before the next poll cycle)
 
     ::qpid::management::ManagementAgent::DeletedObjectList delObjs;
-    tm->GetManagementObject()->resourceDestroy();
+    tm->GetManagementObjectShared()->resourceDestroy();
     agent->exportDeletedObjects( delObjs );
     BOOST_CHECK(delObjs.size() == 1);
 
@@ -478,8 +478,8 @@ QPID_AUTO_TEST_CASE(v1ExportFastDelObj)
     // add, then immediately delete and export the object...
 
     ::qpid::management::ManagementAgent::DeletedObjectList delObjs;
-    agent->addObject(tm->GetManagementObject(), 999);
-    tm->GetManagementObject()->resourceDestroy();
+    agent->addObject(tm->GetManagementObjectShared(), 999);
+    tm->GetManagementObjectShared()->resourceDestroy();
     agent->exportDeletedObjects( delObjs );
     BOOST_CHECK(delObjs.size() == 1);
 
@@ -511,8 +511,8 @@ QPID_AUTO_TEST_CASE(v1ImportMultiDelObj)
         // FOR ALL OBJECTS, so objLen will be the same.  Otherwise the
         // decodeV1ObjectUpdates() will fail (v1 lacks explict encoded length).
         TestManageable *tm = new TestManageable(agent, key.str());
-        objLen = tm->GetManagementObject()->writePropertiesSize();
-        agent->addObject(tm->GetManagementObject(), i + 1);
+        objLen = tm->GetManagementObjectShared()->writePropertiesSize();
+        agent->addObject(tm->GetManagementObjectShared(), i + 1);
         tmv.push_back(tm);
     }
 
@@ -531,7 +531,7 @@ QPID_AUTO_TEST_CASE(v1ImportMultiDelObj)
 
     uint32_t delCount = 0;
     for (size_t i = 0; i < objCount; i += 2) {
-        tmv[i]->GetManagementObject()->resourceDestroy();
+        tmv[i]->GetManagementObjectShared()->resourceDestroy();
         delCount++;
     }
 
@@ -604,8 +604,8 @@ QPID_AUTO_TEST_CASE(v2ImportMultiDelObj)
         std::stringstream key;
         key << "testobj-" << i;
         TestManageable *tm = new TestManageable(agent, key.str());
-        if (tm->GetManagementObject()->writePropertiesSize()) {}
-        agent->addObject(tm->GetManagementObject(), key.str());
+        if (tm->GetManagementObjectShared()->writePropertiesSize()) {}
+        agent->addObject(tm->GetManagementObjectShared(), key.str());
         tmv.push_back(tm);
     }
 
@@ -624,7 +624,7 @@ QPID_AUTO_TEST_CASE(v2ImportMultiDelObj)
 
     uint32_t delCount = 0;
     for (size_t i = 0; i < objCount; i += 2) {
-        tmv[i]->GetManagementObject()->resourceDestroy();
+        tmv[i]->GetManagementObjectShared()->resourceDestroy();
         delCount++;
     }
 
@@ -689,12 +689,12 @@ QPID_AUTO_TEST_CASE(v2RapidRestoreObj)
     TestManageable *tm1 = new TestManageable(agent, std::string("obj2"));
     TestManageable *tm2 = new TestManageable(agent, std::string("obj2"));
 
-    Receiver r1 = fix->createV2DataIndRcvr(tm1->GetManagementObject()->getPackageName(), "#");
+    Receiver r1 = fix->createV2DataIndRcvr(tm1->GetManagementObjectShared()->getPackageName(), "#");
 
     // add, then immediately delete and re-add a copy of the object
-    agent->addObject(tm1->GetManagementObject(), "testobj-1");
-    tm1->GetManagementObject()->resourceDestroy();
-    agent->addObject(tm2->GetManagementObject(), "testobj-1");
+    agent->addObject(tm1->GetManagementObjectShared(), "testobj-1");
+    tm1->GetManagementObjectShared()->resourceDestroy();
+    agent->addObject(tm2->GetManagementObjectShared(), "testobj-1");
 
     // expect: a delete notification, then an update notification
     TestObjectVector objs;
diff --git a/qpid/cpp/src/tests/testagent.cpp b/qpid/cpp/src/tests/testagent.cpp
index d538a8181c..e6010a8e00 100644
--- a/qpid/cpp/src/tests/testagent.cpp
+++ b/qpid/cpp/src/tests/testagent.cpp
@@ -59,7 +59,7 @@ class CoreClass : public Manageable
 {
     string           name;
     ManagementAgent* agent;
-    _qmf::Parent::shared_ptr mgmtObject;
+    _qmf::Parent* mgmtObject;
     std::vector<ChildClass*> children;
     Mutex vectorLock;
 
@@ -68,7 +68,7 @@ public:
     CoreClass(ManagementAgent* agent, string _name);
     ~CoreClass() { mgmtObject->resourceDestroy(); }
 
-    ManagementObject::shared_ptr GetManagementObject(void) const
+    ManagementObject* GetManagementObject(void) const
     { return mgmtObject; }
 
     void doLoop();
@@ -78,14 +78,14 @@ public:
 class ChildClass : public Manageable
 {
     string name;
-    _qmf::Child::shared_ptr mgmtObject;
+    _qmf::Child* mgmtObject;
 
 public:
 
     ChildClass(ManagementAgent* agent, CoreClass* parent, string name);
     ~ChildClass() { mgmtObject->resourceDestroy(); }
 
-    ManagementObject::shared_ptr GetManagementObject(void) const
+    ManagementObject* GetManagementObject(void) const
     { return mgmtObject; }
 
     void doWork()
@@ -97,9 +97,9 @@ public:
 CoreClass::CoreClass(ManagementAgent* _agent, string _name) : name(_name), agent(_agent)
 {
     static uint64_t persistId = 0x111222333444555LL;
-    mgmtObject = _qmf::Parent::shared_ptr(new _qmf::Parent(agent, this, name));
+    mgmtObject = new _qmf::Parent(agent, this, name);
 
-    agent->addObject(mgmtObject.get(), persistId++);
+    agent->addObject(mgmtObject, persistId++);
     mgmtObject->set_state("IDLE");
 }
 
@@ -146,9 +146,9 @@ Manageable::status_t CoreClass::ManagementMethod(uint32_t methodId, Args& args,
 
 ChildClass::ChildClass(ManagementAgent* agent, CoreClass* parent, string name)
 {
-    mgmtObject = _qmf::Child::shared_ptr(new _qmf::Child(agent, this, parent, name));
+    mgmtObject = new _qmf::Child(agent, this, parent, name);
 
-    agent->addObject(mgmtObject.get());
+    agent->addObject(mgmtObject);
 }