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/broker/System.cpp | |
| 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/broker/System.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/System.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/qpid/broker/System.cpp b/cpp/src/qpid/broker/System.cpp index a11ad25bbe..86933109a1 100644 --- a/cpp/src/qpid/broker/System.cpp +++ b/cpp/src/qpid/broker/System.cpp @@ -18,7 +18,8 @@ // #include "System.h" -#include "qpid/agent/ManagementAgent.h" +#include "Broker.h" +#include "qpid/management/ManagementAgent.h" #include "qpid/framing/Uuid.h" #include "qpid/sys/SystemInfo.h" #include <iostream> @@ -29,9 +30,9 @@ using namespace qpid::broker; using namespace std; namespace _qmf = qmf::org::apache::qpid::broker; -System::System (string _dataDir) : mgmtObject(0) +System::System (string _dataDir, Broker* broker) : mgmtObject(0) { - ManagementAgent* agent = ManagementAgent::Singleton::getInstance(); + ManagementAgent* agent = broker ? broker->getManagementAgent() : 0; if (agent != 0) { |