diff options
| author | Alan Conway <aconway@apache.org> | 2010-01-29 15:14:59 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-01-29 15:14:59 +0000 |
| commit | 28ef37542ba19b088f60f8b3542f9f73127a911d (patch) | |
| tree | 0ff420ce3d84e2a884e02e49f8ee99431af94b0d /cpp/src | |
| parent | 7a2d5a4b76fdfd2dc40b0110abd16b37e374a108 (diff) | |
| download | qpid-python-28ef37542ba19b088f60f8b3542f9f73127a911d.tar.gz | |
Fixed missing ManagementAgent test, causing core dumps in cluster with --mgmt-enable=no.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@904515 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/cluster/UpdateClient.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/cpp/src/qpid/cluster/UpdateClient.cpp b/cpp/src/qpid/cluster/UpdateClient.cpp index 3fba194d44..6c8bb7e890 100644 --- a/cpp/src/qpid/cluster/UpdateClient.cpp +++ b/cpp/src/qpid/cluster/UpdateClient.cpp @@ -190,14 +190,15 @@ template <class T> std::string encode(const T& t) { // void UpdateClient::updateManagementSetupState(Broker & b) { - qmf::org::apache::qpid::broker::ManagementSetupState mss(b.getManagementAgent(), 0); - mss.set_objectNum(b.getManagementAgent()->getNextObjectId()); - mss.set_bootSequence(b.getManagementAgent()->getBootSequence()); - - QPID_LOG(debug, updaterId << " updating management-setup-state " << mss.get_objectNum() - << " " << mss.get_bootSequence() << "\n"); - - ClusterConnectionProxy(session).managementSetupState(mss.get_objectNum(), mss.get_bootSequence()); + management::ManagementAgent* agent = updaterBroker.getManagementAgent(); + if (agent) { + qmf::org::apache::qpid::broker::ManagementSetupState mss(b.getManagementAgent(), 0); + mss.set_objectNum(b.getManagementAgent()->getNextObjectId()); + mss.set_bootSequence(b.getManagementAgent()->getBootSequence()); + QPID_LOG(debug, updaterId << " updating management-setup-state " << mss.get_objectNum() + << " " << mss.get_bootSequence() << "\n"); + ClusterConnectionProxy(session).managementSetupState(mss.get_objectNum(), mss.get_bootSequence()); + } } void UpdateClient::updateExchange(const boost::shared_ptr<Exchange>& ex) { |