Don't close channel on connection (resulting in BrokerAdapter being deleted) until close request has been successfully sent.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@499332 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 1 insertions, 1 deletions

diff --git a/cpp/lib/broker/BrokerAdapter.cpp b/cpp/lib/broker/BrokerAdapter.cpp
index fda7d15784..585be5f79d 100644
--- a/cpp/lib/broker/BrokerAdapter.cpp
+++ b/cpp/lib/broker/BrokerAdapter.cpp
@@ -516,10 +516,10 @@ void BrokerAdapter::handleMethodInContext(
     try{
         method->invoke(*serverOps, context);
     }catch(ChannelException& e){
-        connection.closeChannel(getId());
         connection.client->getChannel().close(
             context, e.code, e.toString(),
             method->amqpClassId(), method->amqpMethodId());
+        connection.closeChannel(getId());
     }catch(ConnectionException& e){
         connection.client->getConnection().close(
             context, e.code, e.toString(),