From 558e92d6c9cf8dfb875c1250ab8fe1cefaf30b05 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Sun, 21 Sep 2008 05:04:04 +0000 Subject: DumpClient send connections & session IDs to new members. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@697446 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/cluster/MemberHandler.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'cpp/src/qpid/cluster/MemberHandler.cpp') diff --git a/cpp/src/qpid/cluster/MemberHandler.cpp b/cpp/src/qpid/cluster/MemberHandler.cpp index 1997ced9b0..ec9e7790c5 100644 --- a/cpp/src/qpid/cluster/MemberHandler.cpp +++ b/cpp/src/qpid/cluster/MemberHandler.cpp @@ -47,7 +47,6 @@ void MemberHandler::configChange( } void MemberHandler::deliver(Event& e) { - e.setConnection(cluster.getConnection(e.getConnectionId())); cluster.connectionEventQueue.push(e); } @@ -64,7 +63,7 @@ void MemberHandler::dumpRequest(const MemberId& dumpee, const std::string& urlSt cluster.stall(); if (dumpThread.id()) dumpThread.join(); // Join the last dumpthread. - dumpThread = Thread(new DumpClient(Url(urlStr), cluster.broker, + dumpThread = Thread(new DumpClient(Url(urlStr), cluster, boost::bind(&MemberHandler::dumpSent, this), boost::bind(&MemberHandler::dumpError, this, _1))); } @@ -92,4 +91,9 @@ void MemberHandler::insert(const boost::intrusive_ptr& c) { cluster.connections[c->getId()] = c; } +void MemberHandler::catchUpClosed(const boost::intrusive_ptr& c) { + QPID_LOG(warning, "Catch-up connection " << c << " closed in member mode"); + assert(0); +} + }} // namespace qpid::cluster -- cgit v1.2.1