summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2009-09-01 15:22:48 +0000
committerGordon Sim <gsim@apache.org>2009-09-01 15:22:48 +0000
commit2efb7bb5c2bbd3df778710cfb67a630fa6d4d0fa (patch)
tree628c02aeddb3f0569d1784bb2ae7ca8dc92ee82b /qpid/cpp/src
parentba5f2293f89b9ff044378f78db26c8728725244f (diff)
downloadqpid-python-2efb7bb5c2bbd3df778710cfb67a630fa6d4d0fa.tar.gz
QPID-2078: Ensure sessions are cleaned up when their connection is closed by management.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@810094 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/broker/Connection.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/broker/Connection.cpp b/qpid/cpp/src/qpid/broker/Connection.cpp
index a1a3c6ada7..3b8a6c71d4 100644
--- a/qpid/cpp/src/qpid/broker/Connection.cpp
+++ b/qpid/cpp/src/qpid/broker/Connection.cpp
@@ -269,11 +269,13 @@ bool Connection::doOutput() {
cb(); // Lend the IO thread for management processing
}
}
- if (mgmtClosing)
+ if (mgmtClosing) {
+ closed();
close(connection::CLOSE_CODE_CONNECTION_FORCED, "Closed by Management Request");
- else
+ } else {
//then do other output as needed:
return outputTasks.doOutput();
+ }
}catch(ConnectionException& e){
close(e.code, e.getMessage());
}catch(std::exception& e){