diff options
| author | Alan Conway <aconway@apache.org> | 2013-01-31 19:43:33 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2013-01-31 19:43:33 +0000 |
| commit | 666313e38484b8a50a47a808afe2e275dfe79ff0 (patch) | |
| tree | 09ca5124d9009e4baefb5b6592614e777bc3e06e /cpp | |
| parent | cfe2e205dc364ce50d3b173eaaf3824c9767f01a (diff) | |
| download | qpid-python-666313e38484b8a50a47a808afe2e275dfe79ff0.tar.gz | |
QPID-4555: HA fix deletion of self from membership.
It was possible for a membership update to erase a broker it's own membership.
This caused infrequent core dumps while running ha_tests.test_failover_send_receive.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1441162 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/qpid/ha/Membership.cpp | 3 |
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; |