From c1266e53dd9c20447f658b050fb789d4f0f9ab12 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 8 Mar 2010 17:34:09 +0000 Subject: QPID-2436: Fix cluster update of remote agents. The v2key of cluster agents was not being passed as part of a cluster update. This meant they were not being associated with the correct shadow connections on the updatee. This caused inconsistencies that shut down the new broker. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@920414 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/cluster/Connection.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cpp/src/qpid/cluster/Connection.cpp') diff --git a/cpp/src/qpid/cluster/Connection.cpp b/cpp/src/qpid/cluster/Connection.cpp index 6385729a09..1166f685d2 100644 --- a/cpp/src/qpid/cluster/Connection.cpp +++ b/cpp/src/qpid/cluster/Connection.cpp @@ -542,7 +542,7 @@ void Connection::addQueueListener(const std::string& q, uint32_t listener) { void Connection::managementSchema(const std::string& data) { management::ManagementAgent* agent = cluster.getBroker().getManagementAgent(); if (!agent) - throw Exception(QPID_MSG("Management schema update but no management agent.")); + throw Exception(QPID_MSG("Management schema update but management not enabled.")); framing::Buffer buf(const_cast(data.data()), data.size()); agent->importSchemas(buf); QPID_LOG(debug, cluster << " updated management schemas"); @@ -557,7 +557,7 @@ void Connection::managementSetupState(uint64_t objectNum, uint16_t bootSequence) << objectNum << " seq " << bootSequence); management::ManagementAgent* agent = cluster.getBroker().getManagementAgent(); if (!agent) - throw Exception(QPID_MSG("Management schema update but no management agent.")); + throw Exception(QPID_MSG("Management schema update but management not enabled.")); agent->setNextObjectId(objectNum); agent->setBootSequence(bootSequence); } @@ -565,7 +565,7 @@ void Connection::managementSetupState(uint64_t objectNum, uint16_t bootSequence) void Connection::managementAgents(const std::string& data) { management::ManagementAgent* agent = cluster.getBroker().getManagementAgent(); if (!agent) - throw Exception(QPID_MSG("Management agents update but no management agent.")); + throw Exception(QPID_MSG("Management agent update but management not enabled.")); framing::Buffer buf(const_cast(data.data()), data.size()); agent->importAgents(buf); QPID_LOG(debug, cluster << " updated management agents"); -- cgit v1.2.1