Handle exceptions while doing 'output' for the connection (i.e. message delivery)

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

1 files changed, 8 insertions, 1 deletions

diff --git a/qpid/cpp/src/qpid/broker/Connection.cpp b/qpid/cpp/src/qpid/broker/Connection.cpp
index 6a13c05242..4f0eeaa21a 100644
--- a/qpid/cpp/src/qpid/broker/Connection.cpp
+++ b/qpid/cpp/src/qpid/broker/Connection.cpp
@@ -99,7 +99,14 @@ void Connection::closed(){ // Physically closed, suspend open sessions.
 
 bool Connection::doOutput()
 {
-    return outputTasks.doOutput();
+    try{
+        return outputTasks.doOutput();
+    }catch(ConnectionException& e){
+        close(e.code, e.what(), 0, 0);
+    }catch(std::exception& e){
+        close(541/*internal error*/, e.what(), 0, 0);
+    }
+    return false;
 }
 
 void Connection::closeChannel(uint16_t id) {