[tomcat] branch main updated: Remove Jasper dependency on removed JreCompat

[ma...@apache.org]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 8b54724  Remove Jasper dependency on removed JreCompat
8b54724 is described below

commit 8b54724d541e66a7650d4c52b5582dc05abe4fe4
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jul 28 12:13:33 2021 +0100

    Remove Jasper dependency on removed JreCompat
---
 java/org/apache/jasper/compiler/Generator.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index eea8225..1186c37 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -49,7 +49,6 @@ import jakarta.servlet.jsp.tagext.TagInfo;
 import jakarta.servlet.jsp.tagext.TagVariableInfo;
 import jakarta.servlet.jsp.tagext.VariableInfo;
 
-import org.apache.el.util.JreCompat;
 import org.apache.jasper.Constants;
 import org.apache.jasper.JasperException;
 import org.apache.jasper.JspCompilationContext;
@@ -1350,13 +1349,12 @@ class Generator {
                     // Check the bean is public, not an interface, not abstract
                     // and (for Java 9+) in an exported module
                     int modifiers = bean.getModifiers();
-                    JreCompat jreCompat = JreCompat.getInstance();
                     // No need to test for being an interface here as the
                     // getConstructor() call above will have already failed for
                     // any interfaces.
                     if (!Modifier.isPublic(modifiers) ||
                             Modifier.isAbstract(modifiers) ||
-                            !jreCompat.canAccess(null, constructor) ) {
+                            !constructor.canAccess(null) ) {
                         throw new Exception(Localizer.getMessage("jsp.error.invalid.bean",
                                 Integer.valueOf(modifiers)));
                     }

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