QPID-3611: use socket.close() on SSLSockets to prevent IoReceiver causing an UnsupportedOperationException, e.g during ConnectionClose on the broker

Merged from trunk r1200921


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

1 files changed, 3 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 d4b5975e54..5b714434d9 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
@@ -33,6 +33,8 @@ import java.net.SocketException;
 import java.nio.ByteBuffer;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import javax.net.ssl.SSLSocket;
+
 /**
  * IoReceiver
  *
@@ -94,7 +96,7 @@ final class IoReceiver implements Runnable, Closeable
             {
                 try
                 {
-                    if (shutdownBroken)
+                    if (shutdownBroken || socket instanceof SSLSocket)
                     {
                        socket.close();
                     }