summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2012-02-14 16:09:15 +0000
committerAlan Conway <aconway@apache.org>2012-02-14 16:09:15 +0000
commit28cb9642ed69dcf817c0dd1a5a604f8425c68d18 (patch)
tree2e402caeab4f8f5c95cf02c8a8593b130f88c00f
parentcba6c55192c53f1c9fec9157f86287fd929833a8 (diff)
downloadqpid-python-28cb9642ed69dcf817c0dd1a5a604f8425c68d18.tar.gz
QPID-3603: HA enforces management enabled.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3603-6@1244084 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);