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 | 4ec76087478bfb1a92eb5b88f205bc901acae209 (patch) | |
| tree | f3fbda518939fd9c5ca377be5aeea7e71fb7f827 /qpid/java | |
| parent | 18691aa1cc5d782a6bed34c6979e21e52adc268c (diff) | |
| download | qpid-python-4ec76087478bfb1a92eb5b88f205bc901acae209.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@1200921 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java | 4 |
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(); } |
