# HG changeset patch
# User jjiang
# Date 1529547341 -28800
#      Thu Jun 21 10:15:41 2018 +0800
# Node ID aab3a21f894b2d81bb25c11fc232a23c45cb931d
# Parent  898937a8f83fcbc40e9eb2f8f8f9f890d1851ba0
8205014: com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java failed with "Read timed out"
Reviewed-by: sgehwolf

diff --git a/test/ProblemList.txt b/test/ProblemList.txt
--- a/test/ProblemList.txt
+++ b/test/ProblemList.txt
@@ -387,8 +387,5 @@
 
 ############################################################################
 
-# 8141370
-com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java			linux-i586,macosx-all
-
 sample/mergesort/MergeSortTest.java				8178912 generic-all
 sample/chatserver/ChatTest.java					8178912 generic-all
diff --git a/test/com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java b/test/com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java
--- a/test/com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java
+++ b/test/com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java
@@ -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();