[8u] RFR (S) 8205014: com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java failed with "Read timed out"

[Severin Gehwolf]

On Tue, 2021-04-27 at 11:44 +0200, Aleksey Shipilev wrote:
> Original fix:
>    https://bugs.openjdk.java.net/browse/JDK-8205014
>    https://hg.openjdk.java.net/jdk/sandbox/rev/85305a50b1b4
> 
> This is apparently missing in 8u TLS 1.3 backport! This thing is kinda
> unusual, because it backports the patch from sandbox. The patch also
> does not apply cleanly, and I had to reapply it by hand.

In later JDKs this got added with:

8196584: TLS 1.3 Implementation

$ hg diff -c 68fa3d4026ea --stat | grep DeadSSLLdap
 test/jdk/com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java                                                                                                       |     5 +-
$ hg diff -c 68fa3d4026ea test/jdk/com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java
diff --git a/test/jdk/com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java b/test/jdk/com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java
--- a/test/jdk/com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java
+++ b/test/jdk/com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,7 +67,8 @@
     public void performOp(InitialContext ctx) throws NamingException {}
 
     public void handleNamingException(NamingException e, long start, long end) {
-        if (e.getCause() instanceof SocketTimeoutException) {
+        if (e.getCause() instanceof SocketTimeoutException
+                || e.getCause().getCause() instanceof SocketTimeoutException) {
             // SSL connect will timeout via readReply using
             // SocketTimeoutException
             e.printStackTrace();



There are conflicts in both ProblemList and the code itself.

8u webrev:
   https://cr.openjdk.java.net/~shade/8205014/webrev.8u.01/

Looks fine to me.

Thanks,
Severin