summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/cluster/MemberHandler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/qpid/cluster/MemberHandler.cpp')
-rw-r--r--cpp/src/qpid/cluster/MemberHandler.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/qpid/cluster/MemberHandler.cpp b/cpp/src/qpid/cluster/MemberHandler.cpp
index ec9e7790c5..0f600a4995 100644
--- a/cpp/src/qpid/cluster/MemberHandler.cpp
+++ b/cpp/src/qpid/cluster/MemberHandler.cpp
@@ -34,7 +34,8 @@ using namespace framing;
MemberHandler::MemberHandler(Cluster& c) : ClusterHandler(c) {}
MemberHandler::~MemberHandler() {
- if (dumpThread.id()) dumpThread.join(); // Join the last dumpthread.
+ if (dumpThread.id())
+ dumpThread.join(); // Join the last dumpthread.
}
void MemberHandler::configChange(
@@ -62,7 +63,8 @@ void MemberHandler::dumpRequest(const MemberId& dumpee, const std::string& urlSt
assert(!cluster.connectionEventQueue.isStopped()); // Not currently stalled.
cluster.stall();
- if (dumpThread.id()) dumpThread.join(); // Join the last dumpthread.
+ if (dumpThread.id())
+ dumpThread.join(); // Join the previous dumpthread.
dumpThread = Thread(new DumpClient(Url(urlStr), cluster,
boost::bind(&MemberHandler::dumpSent, this),
boost::bind(&MemberHandler::dumpError, this, _1)));