diff options
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/ha/HaBroker.cpp | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/ha/Primary.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/qpid/cpp/src/qpid/ha/HaBroker.cpp b/qpid/cpp/src/qpid/ha/HaBroker.cpp index a0502b94ae..a4e7c94ca6 100644 --- a/qpid/cpp/src/qpid/ha/HaBroker.cpp +++ b/qpid/cpp/src/qpid/ha/HaBroker.cpp @@ -288,7 +288,7 @@ void HaBroker::setMembership(const Variant::List& brokers) { membership.assign(brokers); QPID_LOG(debug, logPrefix << "Membership update: " << membership); BrokerInfo info; - // Update my status to what the primary thinks. + // Update my status to what the primary says. if (membership.get(systemId, info) && status != info.getStatus()) setStatus(info.getStatus(), l); membershipUpdated(brokers); diff --git a/qpid/cpp/src/qpid/ha/Primary.cpp b/qpid/cpp/src/qpid/ha/Primary.cpp index 2a3eb86b64..08e2379097 100644 --- a/qpid/cpp/src/qpid/ha/Primary.cpp +++ b/qpid/cpp/src/qpid/ha/Primary.cpp @@ -129,11 +129,10 @@ void Primary::checkReady(Mutex::ScopedLock&) { void Primary::checkReady(BackupMap::iterator i, Mutex::ScopedLock& l) { if (i != backups.end() && i->second->isReady()) { BrokerInfo info = i->second->getBrokerInfo(); - QPID_LOG(info, "Expected backup is ready: " << info); info.setStatus(READY); + QPID_LOG(info, "Expected backup is ready: " << info); haBroker.addBroker(info); - expectedBackups.erase(i->second); - checkReady(l); + if (expectedBackups.erase(i->second)) checkReady(l); } } |