diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2010-06-14 14:50:44 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2010-06-14 14:50:44 +0000 |
| commit | 7b35cbd88dc89b8b4b6e5539e13ff754ced70536 (patch) | |
| tree | 2852f172ebb071bf4d593d0641433c86e995dabb | |
| parent | 758ec82123ff11fdfe2e9d7b65b14669d01b2239 (diff) | |
| download | qpid-python-7b35cbd88dc89b8b4b6e5539e13ff754ced70536.tar.gz | |
Allow entry into notifyPendingWrite() if already stopped as it is too hard
to eliminate a race that can cause this, and it is essentially harmless if
ignored
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@954499 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp b/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp index 25301e9850..845e84eec3 100644 --- a/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp +++ b/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp @@ -210,8 +210,8 @@ namespace Rdma { newState = NOTIFY_WRITE; break; case SHUTDOWN: - // This is not allowed - we can't make any more writes as we shut the connection down. - assert(oldState!=SHUTDOWN); + // We can get here because it is too hard to eliminate all races of stop() and notifyPendingWrite() + // just do nothing. doReturn = true; case DRAINED: // This is not allowed - we can't make any more writes as we're draining the write queue. |