summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2012-02-17 14:13:54 +0000
committerAlan Conway <aconway@apache.org>2012-02-17 14:13:54 +0000
commite654681a464b452efce4d2ae585af714a495808a (patch)
tree4e2efac16b5924721f48c4082de529d67f0c767c
parent4cf57e16d97967e661e69641331c8d9e42b9dc3c (diff)
downloadqpid-python-e654681a464b452efce4d2ae585af714a495808a.tar.gz
QPID-3603: HA enforces management enabled.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3603-7@1245532 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/ha/HaBroker.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/qpid/cpp/src/qpid/ha/HaBroker.cpp b/qpid/cpp/src/qpid/ha/HaBroker.cpp
index a1350e492a..60b4b69581 100644
--- a/qpid/cpp/src/qpid/ha/HaBroker.cpp
+++ b/qpid/cpp/src/qpid/ha/HaBroker.cpp
@@ -73,6 +73,8 @@ HaBroker::HaBroker(broker::Broker& b, const Settings& s)
new ConnectionExcluder(boost::bind(&HaBroker::isPrimary, this))));
ManagementAgent* ma = broker.getManagementAgent();
+ if (!ma)
+ throw Exception("Cannot start HA: management is disabled");
if (ma) {
_qmf::Package packageInit(ma);
mgmtObject = new _qmf::HaBroker(ma, this);