1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/qpid/broker/SessionHandler.cpp b/cpp/src/qpid/broker/SessionHandler.cpp
index 919a3e6ee8..3baa3a89a7 100644
--- a/cpp/src/qpid/broker/SessionHandler.cpp
+++ b/cpp/src/qpid/broker/SessionHandler.cpp
@@ -69,12 +69,6 @@ void SessionHandler::handleIn(AMQFrame& f) {
                     QPID_MSG("Channel " << channel.get() << " is not open"));
             }
         }
-    } catch(const ChannelException& e) {
-        ignoring=true;          // Ignore trailing frames sent by client.
-        session->detach();
-        session.reset();
-        //TODO: implement new exception handling mechanism
-        //peerSession.closed(e.code, e.what());
     }catch(const ConnectionException& e){
         connection.close(e.code, e.what(), classId(m), methodId(m));
     }catch(const std::exception& e){
@@ -83,6 +77,12 @@ void SessionHandler::handleIn(AMQFrame& f) {
     }
 }
 
+void SessionHandler::destroy() {
+    ignoring=true;          // Ignore trailing frames sent by client.
+    session->detach();
+    session.reset();
+}
+
 void SessionHandler::handleOut(AMQFrame& f) {
     channel.handle(f);          // Send it.
     if (session->sent(f))