diff options
| author | Ted Ross <tross@apache.org> | 2009-05-11 14:16:52 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2009-05-11 14:16:52 +0000 |
| commit | a1b440e5393206ec5833e2d6c2617c2aca71701f (patch) | |
| tree | edbe7aad7a01122986380860c4cedd95086a282a /cpp/src/qpid/cluster | |
| parent | ec0e348d1d14679f72ce704555dd2605880bddfa (diff) | |
| download | qpid-python-a1b440e5393206ec5833e2d6c2617c2aca71701f.tar.gz | |
QPID-1843 - Cleaned up the interface to the broker's internal management agent.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@773570 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/cluster')
| -rw-r--r-- | cpp/src/qpid/cluster/Cluster.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/qpid/cluster/ClusterPlugin.cpp | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp index 677bd2b722..1f39fe9ae9 100644 --- a/cpp/src/qpid/cluster/Cluster.cpp +++ b/cpp/src/qpid/cluster/Cluster.cpp @@ -44,7 +44,7 @@ #include "qpid/log/Helpers.h" #include "qpid/log/Statement.h" #include "qpid/management/IdAllocator.h" -#include "qpid/management/ManagementBroker.h" +#include "qpid/management/ManagementAgent.h" #include "qpid/memory.h" #include "qpid/sys/Thread.h" #include "qpid/sys/LatencyTracker.h" @@ -116,7 +116,7 @@ Cluster::Cluster(const ClusterSettings& set, broker::Broker& b) : lastBroker(false), error(*this) { - mAgent = ManagementAgent::Singleton::getInstance(); + mAgent = broker.getManagementAgent(); if (mAgent != 0){ _qmf::Package packageInit(mAgent); mgmtObject = new _qmf::Cluster (mAgent, this, &broker,name,myUrl.str()); diff --git a/cpp/src/qpid/cluster/ClusterPlugin.cpp b/cpp/src/qpid/cluster/ClusterPlugin.cpp index 66d15fa56b..56c50eafae 100644 --- a/cpp/src/qpid/cluster/ClusterPlugin.cpp +++ b/cpp/src/qpid/cluster/ClusterPlugin.cpp @@ -31,7 +31,7 @@ #include "qpid/sys/AtomicValue.h" #include "qpid/log/Statement.h" -#include "qpid/management/ManagementBroker.h" +#include "qpid/management/ManagementAgent.h" #include "qpid/management/IdAllocator.h" #include "qpid/broker/Exchange.h" #include "qpid/broker/Queue.h" @@ -49,7 +49,6 @@ using namespace std; using broker::Broker; using management::IdAllocator; using management::ManagementAgent; -using management::ManagementBroker; /** Note separating options from settings to work around boost version differences. @@ -140,7 +139,7 @@ struct ClusterPlugin : public Plugin { broker->setConnectionFactory( boost::shared_ptr<sys::ConnectionCodec::Factory>( new ConnectionCodec::Factory(broker->getConnectionFactory(), *cluster))); - ManagementBroker* mgmt = dynamic_cast<ManagementBroker*>(ManagementAgent::Singleton::getInstance()); + ManagementAgent* mgmt = broker->getManagementAgent(); if (mgmt) { std::auto_ptr<IdAllocator> allocator(new UpdateClientIdAllocator()); mgmt->setAllocator(allocator); |