2 files changed, 12 insertions, 1 deletions
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<std::string, Subscription>::iterator i = subscriptions.begin(); i != subscriptions.end(); ++i) {
+        boost::intrusive_ptr<SubscriptionImpl> s = PrivateImplRef<Subscription>::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.
      *