Bug 662765 - Management broker ID should be the same for members of a cluster.

Replicate management UUID and name to members of a cluster.
See https://bugzilla.redhat.com/show_bug.cgi?id=662765.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1049566 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 6 insertions, 5 deletions

diff --git a/qpid/cpp/src/qpid/management/ManagementAgent.cpp b/qpid/cpp/src/qpid/management/ManagementAgent.cpp
index fbbdf111c7..4bacb95c7b 100644
--- a/qpid/cpp/src/qpid/management/ManagementAgent.cpp
+++ b/qpid/cpp/src/qpid/management/ManagementAgent.cpp
@@ -507,7 +507,7 @@ void ManagementAgent::sendBufferLH(Buffer&  buf,
                                    string   routingKey)
 {
     if (suppressed) {
-        QPID_LOG(trace, "Suppressed management message to " << routingKey);
+        QPID_LOG(trace, "Suppressing management message to " << routingKey);
         return;
     }
     if (exchange.get() == 0) return;
@@ -562,7 +562,7 @@ void ManagementAgent::sendBufferLH(const string& data,
     Variant::Map::const_iterator i;
 
     if (suppressed) {
-        QPID_LOG(trace, "Suppressed management message to " << routingKey);
+        QPID_LOG(trace, "Suppressing management message to " << routingKey);
         return;
     }
     if (exchange.get() == 0) return;
diff --git a/qpid/cpp/src/qpid/management/ManagementAgent.h b/qpid/cpp/src/qpid/management/ManagementAgent.h
index 9829094a0f..7f5f3a856e 100644
--- a/qpid/cpp/src/qpid/management/ManagementAgent.h
+++ b/qpid/cpp/src/qpid/management/ManagementAgent.h
@@ -113,8 +113,6 @@ public:
                           const bool topic,
                           int qmfVersion);
 
-    const framing::Uuid& getUuid() const { return uuid; }
-
     /** Disallow a method. Attempts to call it will receive an exception with message. */
     void disallow(const std::string& className, const std::string& methodName, const std::string& message);
 
@@ -138,7 +136,10 @@ public:
     void setNextObjectId(uint64_t o) { nextObjectId = o; }
 
     uint16_t getBootSequence(void) { return bootSequence; }
-    void setBootSequence(uint16_t b) { bootSequence = b; }
+    void setBootSequence(uint16_t b) { bootSequence = b; writeData(); }
+
+    const framing::Uuid& getUuid() const { return uuid; }
+    void setUuid(const framing::Uuid& id) { uuid = id; writeData(); }
 
     // TODO: remove these when Variant API moved into common library.
     static types::Variant::Map toMap(const framing::FieldTable& from);