2 files changed, 3 insertions, 1 deletions
diff --git a/cpp/lib/broker/SessionHandlerImpl.cpp b/cpp/lib/broker/SessionHandlerImpl.cpp
index 5ebc8c3709..da49a94d68 100644
--- a/cpp/lib/broker/SessionHandlerImpl.cpp
+++ b/cpp/lib/broker/SessionHandlerImpl.cpp
@@ -105,9 +105,11 @@ void SessionHandlerImpl::received(qpid::framing::AMQFrame* frame){
             client->getChannel().close(channel, e.code, e.text, method->amqpClassId(), method->amqpMethodId());
         }catch(ConnectionException& e){
             client->getConnection().close(0, e.code, e.text, method->amqpClassId(), method->amqpMethodId());
+            context->close();
         }catch(std::exception& e){
             string error(e.what());
             client->getConnection().close(0, 541/*internal error*/, error, method->amqpClassId(), method->amqpMethodId());
+            context->close();
         }
 	break;
 
diff --git a/cpp/lib/common/sys/apr/LFSessionContext.cpp b/cpp/lib/common/sys/apr/LFSessionContext.cpp
index f0804f6c72..9b12747a97 100644
--- a/cpp/lib/common/sys/apr/LFSessionContext.cpp
+++ b/cpp/lib/common/sys/apr/LFSessionContext.cpp
@@ -145,8 +145,8 @@ void LFSessionContext::stopProcessing(){
 }
 
 void LFSessionContext::close(){
-    closing = true;
     Mutex::ScopedLock l(writeLock);
+    closing = true;
     if(!processing){
         //allow pending frames to be written to socket
         fd.reqevents = APR_POLLOUT;