Author: ritchiem
Date: Wed Oct 28 15:40:30 2009
New Revision: 830631
URL: http://svn.apache.org/viewvc?rev=830631&view=rev
Log:
Move management-agent earlier in the init-sequence so it is destroyed after the
message store is finalized.
Modified:
qpid/branches/0.5.x-dev/qpid/cpp/src/qpid/broker/Broker.cpp
qpid/branches/0.5.x-dev/qpid/cpp/src/qpid/broker/Broker.h
Modified: qpid/branches/0.5.x-dev/qpid/cpp/src/qpid/broker/Broker.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/cpp/src/qpid/broker/Broker.cpp?rev=830631&r1=830630&r2=830631&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/branches/0.5.x-dev/qpid/cpp/src/qpid/broker/Broker.cpp Wed Oct 28
15:40:30 2009
@@ -137,10 +137,10 @@
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),
Modified: qpid/branches/0.5.x-dev/qpid/cpp/src/qpid/broker/Broker.h
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/cpp/src/qpid/broker/Broker.h?rev=830631&r1=830630&r2=830631&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/cpp/src/qpid/broker/Broker.h (original)
+++ qpid/branches/0.5.x-dev/qpid/cpp/src/qpid/broker/Broker.h Wed Oct 28
15:40:30 2009
@@ -125,12 +125,12 @@
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;
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
