From e3ad2146c1fec714e34e09639dba2bcb6b79a30a Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Mon, 9 Jul 2012 12:13:52 +0000 Subject: QPID-3757: clean up demux when subscription manager is destroyed git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1359099 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/client/SubscriptionManagerImpl.cpp | 10 ++++++++++ qpid/cpp/src/qpid/client/SubscriptionManagerImpl.h | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'qpid/cpp/src') diff --git a/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.cpp b/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.cpp index a558d90be8..7dead112e5 100644 --- a/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.cpp +++ b/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.cpp @@ -39,6 +39,16 @@ SubscriptionManagerImpl::SubscriptionManagerImpl(const Session& s) : dispatcher(s), session(s), autoStop(true) {} +SubscriptionManagerImpl::~SubscriptionManagerImpl() +{ + sys::Mutex::ScopedLock l(lock); + for (std::map::iterator i = subscriptions.begin(); i != subscriptions.end(); ++i) { + boost::intrusive_ptr s = PrivateImplRef::get(i->second); + if (s) s->cancelDiversion(); + } + subscriptions.clear(); +} + Subscription SubscriptionManagerImpl::subscribe( MessageListener& listener, const std::string& q, const SubscriptionSettings& ss, const std::string& n) { diff --git a/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.h b/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.h index 6376a05c45..64d922e387 100644 --- a/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.h +++ b/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.h @@ -99,7 +99,8 @@ class SubscriptionManagerImpl : public sys::Runnable, public RefCounted public: /** Create a new SubscriptionManagerImpl associated with a session */ SubscriptionManagerImpl(const Session& session); - + ~SubscriptionManagerImpl(); + /** * Subscribe a MessagesListener to receive messages from queue. * -- cgit v1.2.1