summaryrefslogtreecommitdiff
path: root/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
commitcecee5383faa391c22e520d65a65d29bc8469205 (patch)
treeea40958a3a785f2e04c6c92781fd0412441697f3 /cpp/src
parent2e80b8e3f11e53e757866cb828d1ab885cd27da7 (diff)
downloadqpid-python-cecee5383faa391c22e520d65a65d29bc8469205.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/qpid@810094 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/broker/Connection.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/qpid/broker/Connection.cpp b/cpp/src/qpid/broker/Connection.cpp
index a1a3c6ada7..3b8a6c71d4 100644
--- a/cpp/src/qpid/broker/Connection.cpp
+++ b/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){