summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2012-01-25 22:47:10 +0000
committerAlan Conway <aconway@apache.org>2012-01-25 22:47:10 +0000
commit7b19a8494597dd3c55d9fe390790977e5a021196 (patch)
tree2d755904471347136b53f4907cca7d551478f6f5
parentdeb1247dfb548ce5907a832a6a7f14fc6f533c0a (diff)
downloadqpid-python-7b19a8494597dd3c55d9fe390790977e5a021196.tar.gz
QPID-3603: HA enforces management enabled.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3603-2@1235978 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);