summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/broker/System.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/qpid/broker/System.cpp')
-rw-r--r--cpp/src/qpid/broker/System.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/cpp/src/qpid/broker/System.cpp b/cpp/src/qpid/broker/System.cpp
index 107942fab5..5e51beac35 100644
--- a/cpp/src/qpid/broker/System.cpp
+++ b/cpp/src/qpid/broker/System.cpp
@@ -18,7 +18,7 @@
//
#include "System.h"
-#include "qpid/management/ManagementAgent.h"
+#include "qpid/agent/ManagementAgent.h"
#include "qpid/framing/Uuid.h"
#include <sys/utsname.h>
#include <iostream>
@@ -28,11 +28,11 @@ using qpid::management::ManagementAgent;
using namespace qpid::broker;
using namespace std;
-System::System (string _dataDir)
+System::System (string _dataDir) : mgmtObject(0)
{
- ManagementAgent::shared_ptr agent = ManagementAgent::getAgent ();
+ ManagementAgent* agent = ManagementAgent::getAgent ();
- if (agent.get () != 0)
+ if (agent != 0)
{
framing::Uuid systemId;
@@ -62,8 +62,7 @@ System::System (string _dataDir)
}
}
- mgmtObject = management::System::shared_ptr
- (new management::System (agent.get(), this, systemId));
+ mgmtObject = new management::System (agent, this, systemId);
struct utsname _uname;
if (uname (&_uname) == 0)
{