Minor fixes.

client/SubscriptionManager: made it thread safe, was causing latencytest to crash with --rate and --time-limit.

cluster/Cluster.cpp: don't call cpg_leave during shutdown. Not required and a problem if shutdown was caused by a cpg error.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@745226 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 8 deletions

diff --git a/cpp/src/qpid/client/SubscriptionManager.h b/cpp/src/qpid/client/SubscriptionManager.h
index 89823a11bc..6b45092931 100644
--- a/cpp/src/qpid/client/SubscriptionManager.h
+++ b/cpp/src/qpid/client/SubscriptionManager.h
@@ -95,14 +95,6 @@ namespace client {
  */
 class SubscriptionManager : public sys::Runnable
 {
-    typedef sys::Mutex::ScopedLock Lock;
-    typedef sys::Mutex::ScopedUnlock Unlock;
-
-    qpid::client::Dispatcher dispatcher;
-    qpid::client::AsyncSession session;
-    bool autoStop;
-    SubscriptionSettings defaultSettings;
-    
   public:
     /** Create a new SubscriptionManager associated with a session */
     SubscriptionManager(const Session& session);
@@ -271,6 +263,11 @@ class SubscriptionManager : public sys::Runnable
     Session getSession() const;
 
   private:
+    mutable sys::Mutex lock;
+    qpid::client::Dispatcher dispatcher;
+    qpid::client::AsyncSession session;
+    bool autoStop;
+    SubscriptionSettings defaultSettings;
     std::map<std::string, Subscription> subscriptions;
 };