* 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, 5 insertions, 3 deletions

diff --git a/cpp/src/qpid/client/SessionImpl.cpp b/cpp/src/qpid/client/SessionImpl.cpp
index 4e3f6cdd98..190141c411 100644
--- a/cpp/src/qpid/client/SessionImpl.cpp
+++ b/cpp/src/qpid/client/SessionImpl.cpp
@@ -426,9 +426,12 @@ void SessionImpl::attached(const std::string& _name)
     setState(ATTACHED);
 }
 
-void SessionImpl::detach(const std::string& /*name*/)
+void SessionImpl::detach(const std::string& _name)
 {
-    throw NotImplementedException("Client does not support detach");
+    Lock l(state);
+    if (name != _name) throw InternalErrorException("Incorrect session name");
+    setState(DETACHED);
+    QPID_LOG(info, "Session detached by peer: " << name);
 }
 
 void SessionImpl::detached(const std::string& _name, uint8_t _code)
@@ -561,7 +564,6 @@ void SessionImpl::exception(uint16_t errorCode,
         //should we wait for the timeout response?
         detachedLifetime = 0;
     }
-    detach();
 }