summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/broker/Broker.cpp2
-rw-r--r--cpp/src/qpid/broker/Broker.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index d86f4f8223..fa041db5cd 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -137,10 +137,10 @@ const std::string knownHostsNone("none");
Broker::Broker(const Broker::Options& conf) :
poller(new Poller),
config(conf),
+ managementAgent(conf.enableMgmt ? new ManagementAgent() : 0),
store(0),
acl(0),
dataDir(conf.noDataDir ? std::string() : conf.dataDir),
- managementAgent(conf.enableMgmt ? new ManagementAgent() : 0),
queues(this),
exchanges(this),
links(this),
diff --git a/cpp/src/qpid/broker/Broker.h b/cpp/src/qpid/broker/Broker.h
index 54d3de2257..d150410de7 100644
--- a/cpp/src/qpid/broker/Broker.h
+++ b/cpp/src/qpid/broker/Broker.h
@@ -125,12 +125,12 @@ public:
boost::shared_ptr<sys::Poller> poller;
sys::Timer timer;
Options config;
+ std::auto_ptr<management::ManagementAgent> managementAgent;
ProtocolFactoryMap protocolFactories;
std::auto_ptr<MessageStore> store;
AclModule* acl;
DataDir dataDir;
- std::auto_ptr<management::ManagementAgent> managementAgent;
QueueRegistry queues;
ExchangeRegistry exchanges;
LinkRegistry links;