You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2014/01/24 14:42:31 UTC
svn commit: r1561000 -
/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
Author: robbie
Date: Fri Jan 24 13:42:30 2014
New Revision: 1561000
URL: http://svn.apache.org/r1561000
Log:
QPID-5512: suppress exception sometimes seen due to race while closing the socket on Windows, prevent erroneous ConnectionTest failures.
Patch supplied by Andrew MacBean <an...@gmail.com>
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java?rev=1561000&r1=1560999&r2=1561000&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java Fri Jan 24 13:42:30 2014
@@ -243,7 +243,12 @@ final class IoReceiver implements Runnab
t instanceof SocketException &&
"Socket is closed".equalsIgnoreCase(t.getMessage());
- return !brokenClose && !sslSocketClosed;
+ boolean recvFailed = closed.get() &&
+ shutdownBroken &&
+ t instanceof SocketException &&
+ "Socket operation on nonsocket: recv failed".equalsIgnoreCase(t.getMessage());
+
+ return !brokenClose && !sslSocketClosed && !recvFailed;
}
public Ticker getTicker()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org