Enable cluster-safe assertions on transition to CATCHUP

Delaying until READY was causing multiple clientConnect management
events to be raised, because broker::Connection::setUserId relies on
sys::isCluster to avoid producing duplicate events with
cluster::Connection::announce

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1041179 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 2 deletions

diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp
index acf4206629..b7545ad706 100644
--- a/cpp/src/qpid/cluster/Cluster.cpp
+++ b/cpp/src/qpid/cluster/Cluster.cpp
@@ -913,6 +913,7 @@ bool Cluster::isExpectingUpdate() {
     return state <= UPDATEE;
 }
 
+// Called in update thread or deliver thread.
 void Cluster::checkUpdateIn(Lock& l) {
     if (state != UPDATEE) return; // Wait till we reach the stall point.
     if (!updateClosed) return;  // Wait till update connection closes.
@@ -926,10 +927,11 @@ void Cluster::checkUpdateIn(Lock& l) {
         // thread. It will be updated on delivery of the "ready" we just mcast.
         broker.setClusterUpdatee(false);
         if (mAgent) mAgent->suppress(false); // Enable management output.
-        discarding = false;     // ok to set, we're stalled for update.
+        discarding = false;     // OK to set, we're stalled for update.
         QPID_LOG(notice, *this << " update complete, starting catch-up.");
-        QPID_LOG(debug, debugSnapshot());
+        QPID_LOG(debug, debugSnapshot()); // OK to call because we're stalled.
         if (mAgent) mAgent->clusterUpdate();
+        enableClusterSafe();    // Enable cluster-safe assertions
         deliverEventQueue.start();
     }
     else if (updateRetracted) { // Update was retracted, request another update