Mercurial > hg > icedtea8-forest > jdk
changeset 13789:2cd82eb879dd jdk8u192-b11
Merge
author | aefimov |
---|---|
date | Wed, 03 Oct 2018 19:28:26 +0100 |
parents | c5a95a39b523 (current diff) 5eaf8c860c22 (diff) |
children | b08beab0061b |
files | |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/jndi/ldap/Connection.java Mon Oct 01 23:44:46 2018 +0100 +++ b/src/share/classes/com/sun/jndi/ldap/Connection.java Wed Oct 03 19:28:26 2018 +0100 @@ -382,17 +382,17 @@ // then reset the timeout. if (socket instanceof SSLSocket) { SSLSocket sslSocket = (SSLSocket) socket; - int socketTimeout = sslSocket.getSoTimeout(); if (!IS_HOSTNAME_VERIFICATION_DISABLED) { SSLParameters param = sslSocket.getSSLParameters(); param.setEndpointIdentificationAlgorithm("LDAPS"); sslSocket.setSSLParameters(param); } if (connectTimeout > 0) { + int socketTimeout = sslSocket.getSoTimeout(); sslSocket.setSoTimeout(connectTimeout); // reuse full timeout value + sslSocket.startHandshake(); + sslSocket.setSoTimeout(socketTimeout); } - sslSocket.startHandshake(); - sslSocket.setSoTimeout(socketTimeout); } return socket; }