This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
     new 330515f661 Affects NIO and NIO2
330515f661 is described below

commit 330515f66122cc32ed52a935d6ecd9614b4e76e2
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Jan 14 11:08:20 2026 +0000

    Affects NIO and NIO2
---
 test/org/apache/tomcat/util/net/ocsp/TestOcspTimeout.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/ocsp/TestOcspTimeout.java 
b/test/org/apache/tomcat/util/net/ocsp/TestOcspTimeout.java
index 4cdb9fafbb..fe0d28390d 100644
--- a/test/org/apache/tomcat/util/net/ocsp/TestOcspTimeout.java
+++ b/test/org/apache/tomcat/util/net/ocsp/TestOcspTimeout.java
@@ -65,13 +65,8 @@ public class TestOcspTimeout extends OcspBaseTest {
         try {
             doTest(false, false, ClientCertificateVerification.ENABLED, false, 
Boolean.FALSE);
         } catch (SocketTimeoutException ste) {
-            // NIO2 may throw a SocketTimeoutException rather than a 
SSLHandshakeException
-            if 
(getTomcatInstance().getConnector().getProtocolHandlerClassName().contains("Nio2"))
 {
-                throw new SSLHandshakeException(ste.getMessage());
-            } else {
-                throw ste;
-            }
+            // May throw a SocketTimeoutException rather than a 
SSLHandshakeException
+            throw new SSLHandshakeException(ste.getMessage());
         }
-
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to