summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/cluster/ClusterMap.cpp
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2009-07-31 18:40:26 +0000
committerAlan Conway <aconway@apache.org>2009-07-31 18:40:26 +0000
commit30057848b8044a31631a55b768cc0675b56811d4 (patch)
tree966afc9c78dcfe18f3d9b2d5d19073e668499eb9 /cpp/src/qpid/cluster/ClusterMap.cpp
parent0a26b8c9543e066a19c8b457f41425972eb0b0c4 (diff)
downloadqpid-python-30057848b8044a31631a55b768cc0675b56811d4.tar.gz
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
Diffstat (limited to 'cpp/src/qpid/cluster/ClusterMap.cpp')
-rw-r--r--cpp/src/qpid/cluster/ClusterMap.cpp2
1 files changed, 1 insertions, 1 deletions
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)));