diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/sys/rdma/RdmaIO.cpp | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/cpp/src/qpid/sys/rdma/RdmaIO.cpp b/cpp/src/qpid/sys/rdma/RdmaIO.cpp index 52de923248..6591c6e676 100644 --- a/cpp/src/qpid/sys/rdma/RdmaIO.cpp +++ b/cpp/src/qpid/sys/rdma/RdmaIO.cpp @@ -94,14 +94,11 @@ namespace Rdma { //qpid::sys::ScopedLock<qpid::sys::Mutex> l(stateLock); do { newState = oldState = state.get(); - doReturn = false; - if (oldState != IDLE && oldState != DRAINED) { - doReturn = true; - break; + doReturn = true; + if (oldState == IDLE || oldState == DRAINED) { + doReturn = false; + newState = SHUTDOWN; } - - newState = SHUTDOWN; - } while (!state.boolCompareAndSwap(oldState, newState)); // Ensure we can't get any more callbacks (except for the stopped callback) @@ -125,14 +122,12 @@ namespace Rdma { //qpid::sys::ScopedLock<qpid::sys::Mutex> l(stateLock); do { newState = oldState = state.get(); - doReturn = false; - if (oldState != IDLE) { - doReturn = true; - break; - } - - if (outstandingWrites == 0) { - newState = DRAINED; + doReturn = true; + if (oldState == IDLE) { + doReturn = false; + if (outstandingWrites == 0) { + newState = DRAINED; + } } } while (!state.boolCompareAndSwap(oldState, newState)); if (doReturn) { |