You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2010/08/05 19:07:36 UTC

svn commit: r982698 - /qpid/trunk/qpid/cpp/src/qpid/cluster/Quorum_cman.cpp

Author: aconway
Date: Thu Aug  5 17:07:35 2010
New Revision: 982698

URL: http://svn.apache.org/viewvc?rev=982698&view=rev
Log:
Fix crash on exit with --cluster-cman.

Modified:
    qpid/trunk/qpid/cpp/src/qpid/cluster/Quorum_cman.cpp

Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Quorum_cman.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Quorum_cman.cpp?rev=982698&r1=982697&r2=982698&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/Quorum_cman.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/Quorum_cman.cpp Thu Aug  5 17:07:35 2010
@@ -47,6 +47,7 @@ Quorum::Quorum(boost::function<void()> e
 }
 
 Quorum::~Quorum() {
+    if (dispatchHandle.get()) dispatchHandle->stopWatch();
     dispatchHandle.reset();
     if (cman) cman_finish(cman);
 }
@@ -68,6 +69,7 @@ void Quorum::start(boost::shared_ptr<sys
 
 void Quorum::watch(int fd) {
     cmanFd = fd;
+    if (dispatchHandle.get()) dispatchHandle->stopWatch();
     dispatchHandle.reset(
         new sys::DispatchHandleRef(
             sys::PosixIOHandle(cmanFd),



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org