svn commit: r954499 - /qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp

[as...@apache.org]

Author: astitcher
Date: Mon Jun 14 14:50:44 2010
New Revision: 954499

URL: http://svn.apache.org/viewvc?rev=954499&view=rev
Log:
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

Modified:
    qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp?rev=954499&r1=954498&r2=954499&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp Mon Jun 14 14:50:44 2010
@@ -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.



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org