From 30057848b8044a31631a55b768cc0675b56811d4 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 31 Jul 2009 18:40:26 +0000 Subject: Fix race condition in cluster error handling. If different errors occured almost simultaneously on two different nodes in a cluster, there was a race condition that could cause the cluster to hang. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@799687 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/cluster/ClusterMap.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cpp/src/qpid/cluster/ClusterMap.cpp') diff --git a/cpp/src/qpid/cluster/ClusterMap.cpp b/cpp/src/qpid/cluster/ClusterMap.cpp index e4e0e50fe3..ca5237d6b1 100644 --- a/cpp/src/qpid/cluster/ClusterMap.cpp +++ b/cpp/src/qpid/cluster/ClusterMap.cpp @@ -71,7 +71,7 @@ ClusterMap::ClusterMap(const MemberId& id, const Url& url , bool isMember) : fra joiners[id] = url; } -ClusterMap::ClusterMap(const FieldTable& joinersFt, const FieldTable& membersFt, uint64_t frameSeq_) +ClusterMap::ClusterMap(const FieldTable& joinersFt, const FieldTable& membersFt, framing::SequenceNumber frameSeq_) : frameSeq(frameSeq_) { std::for_each(joinersFt.begin(), joinersFt.end(), boost::bind(&addFieldTableValue, _1, boost::ref(joiners), boost::ref(alive))); -- cgit v1.2.1