Author: gsim
Date: Wed Jun 3 10:31:24 2009
New Revision: 781332
URL: http://svn.apache.org/viewvc?rev=781332&view=rev
Log:
Stop watching the acceptors dispatch handle before it is deleted in ssl and
rdma plugins.
Modified:
qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaIO.h
qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslIo.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslIo.h
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp?rev=781332&r1=781331&r2=781332&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp Wed Jun 3 10:31:24 2009
@@ -446,6 +446,11 @@
ci->nonblocking();
}
+ ConnectionManager::~ConnectionManager()
+ {
+ handle.stopWatch();
+ }
+
void ConnectionManager::start(Poller::shared_ptr poller) {
startConnection(ci);
handle.startWatch(poller);
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaIO.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaIO.h?rev=781332&r1=781331&r2=781332&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaIO.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaIO.h Wed Jun 3 10:31:24 2009
@@ -157,7 +157,7 @@
DisconnectedCallback dc
);
- virtual ~ConnectionManager() {}
+ virtual ~ConnectionManager();
void start(qpid::sys::Poller::shared_ptr poller);
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslIo.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslIo.cpp?rev=781332&r1=781331&r2=781332&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslIo.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslIo.cpp Wed Jun 3 10:31:24 2009
@@ -76,6 +76,11 @@
ignoreSigpipe();
}
+SslAcceptor::~SslAcceptor()
+{
+ handle.stopWatch();
+}
+
void SslAcceptor::start(Poller::shared_ptr poller) {
handle.startWatch(poller);
}
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslIo.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslIo.h?rev=781332&r1=781331&r2=781332&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslIo.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslIo.h Wed Jun 3 10:31:24 2009
@@ -47,6 +47,7 @@
public:
SslAcceptor(const SslSocket& s, Callback callback);
+ ~SslAcceptor();
void start(qpid::sys::Poller::shared_ptr poller);
private:
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
