summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/broker/Broker.cpp
diff options
context:
space:
mode:
authorNuno Santos <nsantos@apache.org>2008-04-15 16:12:01 +0000
committerNuno Santos <nsantos@apache.org>2008-04-15 16:12:01 +0000
commit8507479d8ec50b4854b866a547932e5e38db1cd1 (patch)
treecfb71795c9441265e280f6ccdd2666abf1c4decb /cpp/src/qpid/broker/Broker.cpp
parentc61ea56812df14a7465cb17d840039996e85fe78 (diff)
downloadqpid-python-8507479d8ec50b4854b866a547932e5e38db1cd1.tar.gz
QPID-921: applied qpid-patch36.diff on behalf of Ted Ross
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@648308 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/Broker.cpp')
-rw-r--r--cpp/src/qpid/broker/Broker.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index b9268db9e5..689fb0687c 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -136,7 +136,7 @@ Broker::Broker(const Broker::Options& conf) :
managementAgent->setInterval (conf.mgmtPubInterval);
qpid::management::PackageQpid packageInitializer (managementAgent);
- System* system = new System ();
+ System* system = new System (dataDir.isEnabled () ? dataDir.getPath () : string ());
systemObject = System::shared_ptr (system);
mgmtObject = management::Broker::shared_ptr (new management::Broker (this, system, conf.port));
@@ -149,7 +149,7 @@ Broker::Broker(const Broker::Options& conf) :
mgmtObject->set_dataDirEnabled (dataDir.isEnabled ());
mgmtObject->set_dataDir (dataDir.getPath ());
- managementAgent->addObject (mgmtObject, 1, 0);
+ managementAgent->addObject (mgmtObject, 1, 1);
// Since there is currently no support for virtual hosts, a placeholder object
// representing the implied single virtual host is added here to keep the