diff options
| author | Robert Gemmell <robbie@apache.org> | 2014-01-24 13:42:30 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2014-01-24 13:42:30 +0000 |
| commit | a7a46603638c7594c83ad4cbf38860f1e2389070 (patch) | |
| tree | 54cbe15491c882dd4b4a1a428ddb8dfbf55d6160 /qpid/java/common | |
| parent | c39f6552f63a942f7f97a70df03c0f8f166a8f56 (diff) | |
| download | qpid-python-a7a46603638c7594c83ad4cbf38860f1e2389070.tar.gz | |
QPID-5512: suppress exception sometimes seen due to race while closing the socket on Windows, prevent erroneous ConnectionTest failures.
Patch supplied by Andrew MacBean <andymacbean@gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1561000 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common')
| -rw-r--r-- | qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java index 0ab195ced8..fa2711ddde 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java @@ -243,7 +243,12 @@ final class IoReceiver implements Runnable, Closeable 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() |