* raise error when controls other than attached are received on unattached channel

* corrected exception handling in client and on broker (broker to issue detach)



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

1 files changed, 1 insertions, 5 deletions

diff --git a/cpp/src/qpid/broker/SessionState.cpp b/cpp/src/qpid/broker/SessionState.cpp
index 3c6bed4344..b96d7b5e3f 100644
--- a/cpp/src/qpid/broker/SessionState.cpp
+++ b/cpp/src/qpid/broker/SessionState.cpp
@@ -275,11 +275,7 @@ void SessionState::handle(AMQFrame& frame)
         } else {
             getProxy().getExecution010().exception(e.code, commandId, 0, 0, 0, e.what(), FieldTable());
         }
-        timeout = 0;
-        //The python client doesn't currently detach on receiving an exception
-        //so the session state isn't destroyed. This is a temporary workaround
-        //until that is addressed
-        adapter.destroyExclusiveQueues();
+        throw e;
     }
 }