[tomcat] 04/06: Align with 10.1.x

[markt]

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

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

commit b58a2ada3adba4658d3e8de1ce7067eb90b29bc4
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Nov 24 12:16:46 2021 +0000

    Align with 10.1.x
    
    Change method to one that works with Servlet <=5 and >=6
    Uncomment failure case handling.
---
 test/org/apache/catalina/core/TesterTldListener.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/catalina/core/TesterTldListener.java 
b/test/org/apache/catalina/core/TesterTldListener.java
index 7844886..0036f5b 100644
--- a/test/org/apache/catalina/core/TesterTldListener.java
+++ b/test/org/apache/catalina/core/TesterTldListener.java
@@ -38,7 +38,7 @@ public class TesterTldListener implements 
ServletContextListener {
 
         // Try and use one of the Servlet 3.0 methods that should be blocked
         try {
-            sc.getEffectiveMajorVersion();
+            sc.getServletRegistrations();
             log.append("FAIL-01");
         } catch (UnsupportedOperationException uoe) {
             log.append("PASS-01");
@@ -53,7 +53,7 @@ public class TesterTldListener implements 
ServletContextListener {
         if (servletContext == sce.getServletContext()) {
             log.append("PASS-02");
         } else {
-            //log.append("FAIL-03");
+            log.append("FAIL-03");
         }
     }
 }

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org