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 | efc833f096ecb375c3f8ce29998a2547dfb8743b (patch) | |
| tree | b33e996bdcf28d141caedeeb4accd39d36d51fd6 /cpp/src | |
| parent | af2cd2a34e5ec0b699ae7ba85b37ade8241aa730 (diff) | |
| download | qpid-python-efc833f096ecb375c3f8ce29998a2547dfb8743b.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/qpid@954499 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/sys/rdma/RdmaIO.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/qpid/sys/rdma/RdmaIO.cpp b/cpp/src/qpid/sys/rdma/RdmaIO.cpp index 25301e9850..845e84eec3 100644 --- a/cpp/src/qpid/sys/rdma/RdmaIO.cpp +++ b/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. |