diff options
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/cluster/Cluster.cpp | 8 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/cluster/Cluster.h | 1 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/InitialStatusMap.cpp | 6 |
3 files changed, 6 insertions, 9 deletions
diff --git a/qpid/cpp/src/qpid/cluster/Cluster.cpp b/qpid/cpp/src/qpid/cluster/Cluster.cpp index 08819542c2..b6ee2db362 100644 --- a/qpid/cpp/src/qpid/cluster/Cluster.cpp +++ b/qpid/cpp/src/qpid/cluster/Cluster.cpp @@ -191,12 +191,11 @@ struct ClusterDispatcher : public framing::AMQP_AllOperations::ClusterHandler { void initialStatus(uint32_t version, bool active, const Uuid& clusterId, uint8_t storeState, const Uuid& shutdownId, - const framing::SequenceNumber& configSeq, const std::string& firstConfig) { cluster.initialStatus( member, version, active, clusterId, - framing::cluster::StoreState(storeState), shutdownId, configSeq, + framing::cluster::StoreState(storeState), shutdownId, firstConfig, l); } void ready(const std::string& url) { cluster.ready(member, url, l); } @@ -631,7 +630,7 @@ void Cluster::configChange(const MemberId&, const std::string& configStr, Lock& mcast.mcastControl( ClusterInitialStatusBody( ProtocolVersion(), CLUSTER_VERSION, state > INIT, clusterId, - store.getState(), store.getShutdownId(), store.getConfigSeq(), + store.getState(), store.getShutdownId(), initMap.getFirstConfigStr() ), self); @@ -705,7 +704,6 @@ void Cluster::initialStatus(const MemberId& member, uint32_t version, bool activ const framing::Uuid& id, framing::cluster::StoreState store, const framing::Uuid& shutdownId, - const framing::SequenceNumber& configSeq, const std::string& firstConfig, Lock& l) { @@ -718,7 +716,7 @@ void Cluster::initialStatus(const MemberId& member, uint32_t version, bool activ initMap.received( member, ClusterInitialStatusBody(ProtocolVersion(), version, active, id, - store, shutdownId, configSeq, firstConfig) + store, shutdownId, firstConfig) ); if (initMap.transitionToComplete()) initMapCompleted(l); } diff --git a/qpid/cpp/src/qpid/cluster/Cluster.h b/qpid/cpp/src/qpid/cluster/Cluster.h index 3b12f43d54..e280a7e928 100644 --- a/qpid/cpp/src/qpid/cluster/Cluster.h +++ b/qpid/cpp/src/qpid/cluster/Cluster.h @@ -160,7 +160,6 @@ class Cluster : private Cpg::Handler, public management::Manageable { const framing::Uuid& clusterId, framing::cluster::StoreState, const framing::Uuid& shutdownId, - const framing::SequenceNumber& configSeq, const std::string& firstConfig, Lock&); void ready(const MemberId&, const std::string&, Lock&); diff --git a/qpid/cpp/src/tests/InitialStatusMap.cpp b/qpid/cpp/src/tests/InitialStatusMap.cpp index dc86c41103..91c95ac517 100644 --- a/qpid/cpp/src/tests/InitialStatusMap.cpp +++ b/qpid/cpp/src/tests/InitialStatusMap.cpp @@ -37,19 +37,19 @@ QPID_AUTO_TEST_SUITE(InitialStatusMapTestSuite) typedef InitialStatusMap::Status Status; Status activeStatus(const Uuid& id=Uuid(), const MemberSet& ms=MemberSet()) { - return Status(ProtocolVersion(), 0, true, id, STORE_STATE_NO_STORE, Uuid(), 0, + return Status(ProtocolVersion(), 0, true, id, STORE_STATE_NO_STORE, Uuid(), encodeMemberSet(ms)); } Status newcomerStatus(const Uuid& id=Uuid(), const MemberSet& ms=MemberSet()) { - return Status(ProtocolVersion(), 0, false, id, STORE_STATE_NO_STORE, Uuid(), 0, + return Status(ProtocolVersion(), 0, false, id, STORE_STATE_NO_STORE, Uuid(), encodeMemberSet(ms)); } Status storeStatus(bool active, StoreState state, Uuid start=Uuid(), Uuid stop=Uuid(), const MemberSet& ms=MemberSet()) { - return Status(ProtocolVersion(), 0, active, start, state, stop, 0, + return Status(ProtocolVersion(), 0, active, start, state, stop, encodeMemberSet(ms)); } |