From 326dddd0d0d48401d14ca93044b3fc0e35ad87d9 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 27 Oct 2010 18:01:27 +0000 Subject: Revert experimental cluster code, too close to 0.8 release. Reverts revisions: r1023966 "Introduce broker::Cluster interface." r1024275 "Fix compile error: outline set/getCluster fucntions on Broker." r1027210 "New cluster: core framework and initial implementation of enqueue logic." git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1028055 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/cluster/PollerDispatch.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'cpp/src/qpid/cluster/PollerDispatch.cpp') diff --git a/cpp/src/qpid/cluster/PollerDispatch.cpp b/cpp/src/qpid/cluster/PollerDispatch.cpp index 43c171efe8..b8d94b95a5 100644 --- a/cpp/src/qpid/cluster/PollerDispatch.cpp +++ b/cpp/src/qpid/cluster/PollerDispatch.cpp @@ -37,11 +37,9 @@ PollerDispatch::PollerDispatch(Cpg& c, boost::shared_ptr p, started(false) {} -PollerDispatch::~PollerDispatch() { stop(); } - -void PollerDispatch::stop() { - if (started) dispatchHandle.stopWatch(); - started = false; +PollerDispatch::~PollerDispatch() { + if (started) + dispatchHandle.stopWatch(); } void PollerDispatch::start() { @@ -56,7 +54,6 @@ void PollerDispatch::dispatch(sys::DispatchHandle& h) { h.rewatch(); } catch (const std::exception& e) { QPID_LOG(critical, "Error in cluster dispatch: " << e.what()); - stop(); onError(); } } -- cgit v1.2.1