Author: robbie
Date: Fri Nov 11 15:45:48 2011
New Revision: 1200921
URL: http://svn.apache.org/viewvc?rev=1200921&view=rev
Log:
QPID-3611: use socket.close() on SSLSockets to prevent IoReceiver causing an
UnsupportedOperationException, e.g during ConnectionClose on the broker
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java?rev=1200921&r1=1200920&r2=1200921&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
Fri Nov 11 15:45:48 2011
@@ -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 Runnab
{
try
{
- if (shutdownBroken)
+ if (shutdownBroken || socket instanceof SSLSocket)
{
socket.close();
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
