summaryrefslogtreecommitdiff
path: root/qpid/cpp
diff options
context:
space:
mode:
authorKenneth Anthony Giusti <kgiusti@apache.org>2010-04-06 15:24:33 +0000
committerKenneth Anthony Giusti <kgiusti@apache.org>2010-04-06 15:24:33 +0000
commit949a5cf0cb3605465ae115d809fe1919f1662500 (patch)
tree6d1727edc9ec2e87dfb1f803aa2796ed79fa6390 /qpid/cpp
parent331a2bea4eb38cbba44c82e7286c13b147b5519b (diff)
downloadqpid-python-949a5cf0cb3605465ae115d809fe1919f1662500.tar.gz
verify broker UUID read from config file
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@931182 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
-rw-r--r--qpid/cpp/src/qpid/management/ManagementAgent.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/management/ManagementAgent.cpp b/qpid/cpp/src/qpid/management/ManagementAgent.cpp
index bc62588f5d..4158b685ce 100644
--- a/qpid/cpp/src/qpid/management/ManagementAgent.cpp
+++ b/qpid/cpp/src/qpid/management/ManagementAgent.cpp
@@ -150,7 +150,11 @@ void ManagementAgent::configure(const string& _dataDir, uint16_t _interval,
inFile >> bootSequence;
inFile >> nextRemoteBank;
inFile.close();
- QPID_LOG (debug, "ManagementAgent restored broker ID: " << uuid);
+ if (uuid.isNull()) {
+ uuid.generate();
+ QPID_LOG (info, "No stored broker ID found - ManagementAgent generated broker ID: " << uuid);
+ } else
+ QPID_LOG (debug, "ManagementAgent restored broker ID: " << uuid);
// if sequence goes beyond a 12-bit field, skip zero and wrap to 1.
bootSequence++;