summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/qpid/ha/Membership.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/qpid/ha/Membership.cpp b/cpp/src/qpid/ha/Membership.cpp
index d33d57c37f..6c64d86fd7 100644
--- a/cpp/src/qpid/ha/Membership.cpp
+++ b/cpp/src/qpid/ha/Membership.cpp
@@ -59,6 +59,7 @@ void Membership::add(const BrokerInfo& b) {
void Membership::remove(const types::Uuid& id) {
Mutex::ScopedLock l(lock);
+ if (id == self) return; // Never remove myself
BrokerInfo::Map::iterator i = brokers.find(id);
if (i != brokers.end()) {
brokers.erase(i);
@@ -73,7 +74,7 @@ bool Membership::contains(const types::Uuid& id) {
void Membership::assign(const types::Variant::List& list) {
Mutex::ScopedLock l(lock);
- brokers.clear();
+ clear();
for (types::Variant::List::const_iterator i = list.begin(); i != list.end(); ++i) {
BrokerInfo b(i->asMap());
brokers[b.getSystemId()] = b;