1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/qpid/client/ConnectionHandler.cpp b/cpp/src/qpid/client/ConnectionHandler.cpp
index f20f597d1f..f47506d977 100644
--- a/cpp/src/qpid/client/ConnectionHandler.cpp
+++ b/cpp/src/qpid/client/ConnectionHandler.cpp
@@ -185,10 +185,10 @@ void ConnectionHandler::handle(AMQMethodBody::shared_ptr method)
         break;
     case CLOSING:
         if (method->isA<ConnectionCloseOkBody>()) {
-            setState(CLOSED);
             if (onClose) {
                 onClose();
             }
+            setState(CLOSED);
         } else {
             QPID_LOG(warning, "Received frame on channel zero while closing connection; frame ignored.");        
         }