From a1b440e5393206ec5833e2d6c2617c2aca71701f Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Mon, 11 May 2009 14:16:52 +0000 Subject: 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 --- cpp/src/qpid/broker/System.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'cpp/src/qpid/broker/System.cpp') 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 @@ -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) { -- cgit v1.2.1