3 files changed, 4 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/cluster/Cluster.cpp b/qpid/cpp/src/qpid/cluster/Cluster.cpp
index 19f4318a9c..7feee4ce14 100644
--- a/qpid/cpp/src/qpid/cluster/Cluster.cpp
+++ b/qpid/cpp/src/qpid/cluster/Cluster.cpp
@@ -282,6 +282,7 @@ void Cluster::stall() {
 }
 
 void Cluster::ready() {
+    // Called with lock held
     QPID_LOG(debug, self << " ready at " << url);
     unstall();
     mcastControl(ClusterReadyBody(ProtocolVersion(), url.str()), 0);
diff --git a/qpid/cpp/src/qpid/cluster/JoiningHandler.cpp b/qpid/cpp/src/qpid/cluster/JoiningHandler.cpp
index 6838313263..dbee0ece61 100644
--- a/qpid/cpp/src/qpid/cluster/JoiningHandler.cpp
+++ b/qpid/cpp/src/qpid/cluster/JoiningHandler.cpp
@@ -47,6 +47,7 @@ void JoiningHandler::configChange(
 }
 
 void JoiningHandler::deliver(Event& e) {
+    Mutex::ScopedLock l(cluster.lock);
     // Discard connection events unless we are stalled to receive a  dump.
     if (state == STALLED) 
         cluster.connectionEventQueue.push(e);
@@ -60,7 +61,7 @@ void JoiningHandler::update(const MemberId&, const framing::FieldTable& members,
     checkDumpRequest();
 }
 
-void JoiningHandler::checkDumpRequest() {
+void JoiningHandler::checkDumpRequest() { // Call with lock held
     if (state == START && !cluster.map.dumper) {
         cluster.broker.getPort(); // ensure the broker is listening.
         state = DUMP_REQUESTED;
diff --git a/qpid/cpp/src/qpid/cluster/MemberHandler.cpp b/qpid/cpp/src/qpid/cluster/MemberHandler.cpp
index 99e7b7d683..69fe2eec0b 100644
--- a/qpid/cpp/src/qpid/cluster/MemberHandler.cpp
+++ b/qpid/cpp/src/qpid/cluster/MemberHandler.cpp
@@ -74,6 +74,7 @@ void MemberHandler::dumpRequest(const MemberId& dumpee, const std::string& urlSt
 }
 
 void MemberHandler::ready(const MemberId& id, const std::string& urlStr) {
+    Mutex::ScopedLock l(cluster.lock);
     if (cluster.map.ready(id, Url(urlStr)))
         cluster.updateMemberStats();
 }