diff options
Diffstat (limited to 'luni/src/main')
| -rw-r--r-- | luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java index 4bd91ad..36e7d09 100644 --- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java +++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java @@ -1225,20 +1225,19 @@ public class OpenSSLSocketImpl synchronized (writeLock) { synchronized (readLock) { - IOException pendingException = null; - // Shut down the SSL connection, per se. try { if (handshakeStarted) { BlockGuard.getThreadPolicy().onNetwork(); NativeCrypto.SSL_shutdown(sslNativePointer, fd, this); } - } catch (IOException ex) { + } catch (IOException ignored) { /* - * Note the exception at this point, but try to continue - * to clean the rest of this all up before rethrowing. + * Note that although close() can throw + * IOException, the RI does not throw if there + * is problem sending a "close notify" which + * can happen if the underlying socket is closed. */ - pendingException = ex; } /* @@ -1255,10 +1254,6 @@ public class OpenSSLSocketImpl if (!super.isClosed()) super.close(); } - - if (pendingException != null) { - throw pendingException; - } } } } |