1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/qpid/sys/rdma/RdmaIO.cpp b/cpp/src/qpid/sys/rdma/RdmaIO.cpp
index 6f81450a0c..32bd9cd96b 100644
--- a/cpp/src/qpid/sys/rdma/RdmaIO.cpp
+++ b/cpp/src/qpid/sys/rdma/RdmaIO.cpp
@@ -130,8 +130,6 @@ namespace Rdma {
 
     // Mark writing closed (so we don't accept any more writes or make any idle callbacks)
     void AsynchIO::drainWriteQueue(NotifyCallback nc) {
-        draining = true;
-
         State oldState;
         State newState;
         bool doReturn;
@@ -149,6 +147,7 @@ namespace Rdma {
             }
         } while (!state.boolCompareAndSwap(oldState, newState));
         if (doReturn) {
+            draining = true;
             notifyCallback = nc;
             return;
         }