Bug fix for client shutdown.

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

1 files changed, 14 insertions, 15 deletions

diff --git a/cpp/src/qpid/client/ClientChannel.cpp b/cpp/src/qpid/client/ClientChannel.cpp
index 3cf0373b7f..b36fc82b21 100644
--- a/cpp/src/qpid/client/ClientChannel.cpp
+++ b/cpp/src/qpid/client/ClientChannel.cpp
@@ -137,21 +137,6 @@ void Channel::rollback(){
     session->txRollback();
 }
 
-void Channel::close()
-{
-    session->close();
-    {
-        Mutex::ScopedLock l(lock);
-        if (connection);
-        {
-            session.reset();
-            sessionCore.reset();
-            connection.reset();
-        }
-    }
-    stop();
-}
-
 void Channel::consume(
     Queue& queue, const std::string& tag, MessageListener* listener, 
     AckMode ackMode, bool noLocal, bool synch, const FieldTable* fields) {
@@ -211,6 +196,20 @@ void Channel::publish(const Message& msg, const Exchange& exchange,
     session->basicPublish(0, e, key, mandatory, immediate, msg);
 }
 
+void Channel::close()
+{
+    session->close();
+    {
+        Mutex::ScopedLock l(lock);
+        if (connection);
+        {
+            sessionCore.reset();
+            connection.reset();
+        }
+    }
+    stop();
+}
+
 void Channel::start(){
     running = true;
     dispatcher = Thread(*this);