QPID-1547: ignore socket closed exceptions if shutdownInput is broken

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@729021 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 12 insertions, 3 deletions

diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java b/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
index 5efd51d5db..351d8d24e8 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
@@ -24,9 +24,10 @@ import org.apache.qpid.transport.Receiver;
 import org.apache.qpid.transport.TransportException;
 import org.apache.qpid.transport.util.Logger;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.Socket;
+import java.net.SocketException;
 import java.nio.ByteBuffer;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -46,6 +47,8 @@ final class IoReceiver extends Thread
     private final Socket socket;
     private final long timeout;
     private final AtomicBoolean closed = new AtomicBoolean(false);
+    private final boolean shutdownBroken =
+        ((String) System.getProperties().get("os.name")).matches("(?i).*windows.*");
 
     public IoReceiver(IoTransport transport, Receiver<ByteBuffer> receiver,
                       int bufferSize, long timeout)
@@ -67,7 +70,7 @@ final class IoReceiver extends Thread
         {
             try
             {
-                if (((String) System.getProperties().get("os.name")).matches("(?i).*windows.*"))
+                if (shutdownBroken)
                 {
                    socket.close();
                 }
@@ -125,7 +128,13 @@ final class IoReceiver extends Thread
         }
         catch (Throwable t)
         {
-            receiver.exception(t);
+            if (!(shutdownBroken &&
+                  t instanceof SocketException &&
+                  t.getMessage().equalsIgnoreCase("socket closed") &&
+                  closed.get()))
+            {
+                receiver.exception(t);
+            }
         }
         finally
         {