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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 223ec06531 Fix failing test with APR
223ec06531 is described below

commit 223ec065319c94e11db653f1c9eb29ad1d3fb962
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Jan 14 18:55:56 2026 +0000

    Fix failing test with APR
---
 test/org/apache/tomcat/util/net/ocsp/TestOcspSoftFail.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/ocsp/TestOcspSoftFail.java 
b/test/org/apache/tomcat/util/net/ocsp/TestOcspSoftFail.java
index 382db3838b..0cd783ab44 100644
--- a/test/org/apache/tomcat/util/net/ocsp/TestOcspSoftFail.java
+++ b/test/org/apache/tomcat/util/net/ocsp/TestOcspSoftFail.java
@@ -48,12 +48,8 @@ public class TestOcspSoftFail extends OcspBaseTest {
         try {
             doTest(false, false, ClientCertificateVerification.ENABLED, false, 
Boolean.FALSE);
         } catch (SocketException se) {
-            // NIO2 may throw a SocketException rather than a 
SSLHandshakeException
-            if 
(getTomcatInstance().getConnector().getProtocolHandlerClassName().contains("Nio2"))
 {
-                throw new SSLHandshakeException(se.getMessage());
-            } else {
-                throw se;
-            }
+            // APR or NIO2 may throw a SocketException rather than a 
SSLHandshakeException
+            throw new SSLHandshakeException(se.getMessage());
         }
     }
 }


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

Reply via email to