diff options
author | Alan Conway <aconway@apache.org> | 2010-03-31 16:52:50 +0000 |
---|---|---|
committer | Alan Conway <aconway@apache.org> | 2010-03-31 16:52:50 +0000 |
commit | dda98127df553def41fb332f714c2f91858a7ea3 (patch) | |
tree | 85ce770251b694656176e4e29e055194293f430d /cpp/src/qpid/cluster/ClusterMap.cpp | |
parent | f6f1900eb98cc1773a88a3ec309afa646438a384 (diff) | |
download | qpid-python-dda98127df553def41fb332f714c2f91858a7ea3.tar.gz |
Cluster: remove un-necessary code for config-seq.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@929616 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/cluster/ClusterMap.cpp')
-rw-r--r-- | cpp/src/qpid/cluster/ClusterMap.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/cpp/src/qpid/cluster/ClusterMap.cpp b/cpp/src/qpid/cluster/ClusterMap.cpp index c050293717..040e129970 100644 --- a/cpp/src/qpid/cluster/ClusterMap.cpp +++ b/cpp/src/qpid/cluster/ClusterMap.cpp @@ -57,17 +57,16 @@ void assignFieldTable(FieldTable& ft, const ClusterMap::Map& map) { } -ClusterMap::ClusterMap() : frameSeq(0), configSeq(0) {} +ClusterMap::ClusterMap() : frameSeq(0) {} -ClusterMap::ClusterMap(const Map& map) : frameSeq(0), configSeq(0) { +ClusterMap::ClusterMap(const Map& map) : frameSeq(0) { transform(map.begin(), map.end(), inserter(alive, alive.begin()), bind(&Map::value_type::first, _1)); members = map; } ClusterMap::ClusterMap(const FieldTable& joinersFt, const FieldTable& membersFt, - framing::SequenceNumber frameSeq_, - framing::SequenceNumber configSeq_) - : frameSeq(frameSeq_), configSeq(configSeq_) + framing::SequenceNumber frameSeq_) + : frameSeq(frameSeq_) { for_each(joinersFt.begin(), joinersFt.end(), bind(&addFieldTableValue, _1, ref(joiners), ref(alive))); for_each(membersFt.begin(), membersFt.end(), bind(&addFieldTableValue, _1, ref(members), ref(alive))); @@ -83,7 +82,6 @@ void ClusterMap::toMethodBody(framing::ClusterConnectionMembershipBody& b) const b.getMembers().clear(); for_each(members.begin(), members.end(), bind(&insertFieldTableFromMapValue, ref(b.getMembers()), _1)); b.setFrameSeq(frameSeq); - b.setConfigSeq(configSeq); } Url ClusterMap::getUrl(const Map& map, const MemberId& id) { @@ -136,7 +134,7 @@ ostream& operator<<(ostream& o, const ClusterMap& m) { else o << "(unknown)"; o << " "; } - o << "frameSeq=" << m.getFrameSeq() << " configSeq=" << m.getConfigSeq(); + o << "frameSeq=" << m.getFrameSeq(); return o; } @@ -157,7 +155,6 @@ bool ClusterMap::ready(const MemberId& id, const Url& url) { } bool ClusterMap::configChange(const Set& update) { - ++configSeq; bool memberChange = false; Set removed; set_difference(alive.begin(), alive.end(), |