Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix test com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java JDK-8145252-TLS13-branch
authorjjiang
Thu, 21 Jun 2018 10:15:41 +0800
branchJDK-8145252-TLS13-branch
changeset 56800 85305a50b1b4
parent 56799 c274589ad63b
child 56801 76025c6c6e29
Fix test com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java
test/jdk/ProblemList.txt file | annotate | diff | comparison | revisions
test/jdk/com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java file | annotate | diff | comparison | revisions 
--- a/test/jdk/ProblemList.txt	Wed Jun 20 16:44:40 2018 -0700
+++ b/test/jdk/ProblemList.txt	Thu Jun 21 10:15:41 2018 +0800
@@ -694,7 +694,6 @@
 
 sun/security/mscapi/ShortRSAKeyWithinTLS.java                   8204979 windows-all
 sun/security/pkcs11/KeyStore/ClientAuth.sh                      8204983 generic-all
-com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java                   8205014 generic-all
 
 ############################################################################
 
--- a/test/jdk/com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java	Wed Jun 20 16:44:40 2018 -0700
+++ b/test/jdk/com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java	Thu Jun 21 10:15:41 2018 +0800
@@ -67,7 +67,8 @@
     public void performOp(InitialContext ctx) throws NamingException {}
 
     public void handleNamingException(NamingException e, long start, long end) {
-        if (e.getCause().getCause() instanceof SocketTimeoutException) {
+        if (e.getCause() instanceof SocketTimeoutException
+                || e.getCause().getCause() instanceof SocketTimeoutException) {
             // SSL connect will timeout via readReply using
             // SocketTimeoutException
             e.printStackTrace();
jdk-sandbox