[tomcat] branch main updated: Remove unnecessary code

[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 bccc5ae  Remove unnecessary code
bccc5ae is described below

commit bccc5aebd7ceb0894fbe79d0ba0bcee99e8a1a31
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jul 28 15:19:10 2021 +0100

    Remove unnecessary code
---
 java/jakarta/el/StaticFieldELResolver.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/java/jakarta/el/StaticFieldELResolver.java b/java/jakarta/el/StaticFieldELResolver.java
index 6722c7a..e5e950b 100644
--- a/java/jakarta/el/StaticFieldELResolver.java
+++ b/java/jakarta/el/StaticFieldELResolver.java
@@ -115,10 +115,7 @@ public class StaticFieldELResolver extends ELResolver {
                 // Static method so base should be null
                 Method match = Util.findMethod(clazz, null, methodName, paramTypes, params);
 
-                // Note: On Java 9 and above, the isStatic check becomes
-                // unnecessary because the canAccess() call in Util.findMethod()
-                // effectively performs the same check
-                if (match == null || !Modifier.isStatic(match.getModifiers())) {
+                if (match == null) {
                     throw new MethodNotFoundException(Util.message(context,
                             "staticFieldELResolver.methodNotFound", methodName,
                             clazz.getName()));

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