diff --git a/.hgtags b/.hgtags
index 2f608721dbf94c8b46fe92a87dd6a05d1661ffea..0281b56792ccd6565da78edfed407da08f0b5480 100644
--- a/.hgtags
+++ b/.hgtags
@@ -945,3 +945,4 @@ d679861a9a1efc80e0671b1c6b870fcffbfb9d9c jdk8u181-b32
 ecfdede1e6ddf37dcca415861ab031c18ec4b349 jdk8u181-b34
 ac943243eaf1cb3971b953d56527287ae3f8d223 jdk8u181-b35
 674963395b9f747e746af782f2f3ea7995385420 jdk8u181-b36
+92587df933606ff8f03c6073be6c4089211de2b3 jdk8u181-b37
diff --git a/src/share/classes/com/sun/jndi/ldap/Connection.java b/src/share/classes/com/sun/jndi/ldap/Connection.java
index d9a31884ca0fb9c1673057fc01dd76f6af6e6d9a..0c059f5bfac06ed3819af738d5493174aa1eaea6 100644
--- a/src/share/classes/com/sun/jndi/ldap/Connection.java
+++ b/src/share/classes/com/sun/jndi/ldap/Connection.java
@@ -382,17 +382,17 @@ public final class Connection implements Runnable {
         // 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;
     }