diff options
| author | Robert Gemmell <robbie@apache.org> | 2011-11-11 15:45:48 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2011-11-11 15:45:48 +0000 |
| commit | d76c48c4a2b2ae992737164c71272a567ae7cc82 (patch) | |
| tree | a33e25152b014a1ddfc1595a15ab4cfaa28c723a /java/common | |
| parent | 178f7ceb2114290be1d222a459b4f5ff4b763932 (diff) | |
| download | qpid-python-d76c48c4a2b2ae992737164c71272a567ae7cc82.tar.gz | |
QPID-3611: use socket.close() on SSLSockets to prevent IoReceiver causing an UnsupportedOperationException, e.g during ConnectionClose on the broker
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1200921 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/common')
| -rw-r--r-- | java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java | 4 |
1 files changed, 3 insertions, 1 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 d4b5975e54..5b714434d9 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 @@ -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(); } |