Mercurial > hg > release > icedtea7-forest-2.6 > jdk
changeset 9669:783c09459a69
8211107: LDAPS communication failure with jdk 1.8.0_181
Reviewed-by: chegar, coffeys, vtewari
author | pkoppula |
---|---|
date | Tue, 02 Oct 2018 21:38:54 +0530 |
parents | 9ea121b6409c |
children | 2c8fc8aa5524 |
files | src/share/classes/com/sun/jndi/ldap/Connection.java |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/jndi/ldap/Connection.java Wed Aug 08 00:32:07 2018 -0700 +++ b/src/share/classes/com/sun/jndi/ldap/Connection.java Tue Oct 02 21:38:54 2018 +0530 @@ -386,17 +386,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; }