commit 0a06a40612c4ce3dc72f4cad5e66015e80e86511
author Mark Thomas <markt@apache.org> Fri Oct 04 21:23:42 2019 +0100
committer Mark Thomas <markt@apache.org> Fri Oct 04 22:17:10 2019 +0100
tree 5923f49a31b9a18ae750bafc4bcb51a2dff6cddb
parent e3422cb244f5b1b764a9211aa6f4ec813094d40e

Fix NPEs when looking for static methods

java/javax/el/Util.java

diff --git a/java/javax/el/Util.java b/java/javax/el/Util.java
index 7c91a5d..12cad7d 100644
--- a/java/javax/el/Util.java
+++ b/java/javax/el/Util.java
@@ -543,7 +543,11 @@
      */
     static Method getMethod(Class<?> type, Object base, Method m) {
         JreCompat jreCompat = JreCompat.getInstance();
-        if (m == null || (Modifier.isPublic(type.getModifiers()) && jreCompat.canAcccess(base, m))) {
+        // If base is null, method MUST be static
+        // If base is non-null, method may be static or non-static
+        if (m == null ||
+                (Modifier.isPublic(type.getModifiers()) &&
+                        (jreCompat.canAcccess(base, m) || base != null && jreCompat.canAcccess(null, m)))) {
             return m;
         }
         Class<?>[] inf = type.getInterfaces();

java/org/apache/el/util/ReflectionUtil.java

diff --git a/java/org/apache/el/util/ReflectionUtil.java b/java/org/apache/el/util/ReflectionUtil.java
index 5b88de3..17cbd76 100644
--- a/java/org/apache/el/util/ReflectionUtil.java
+++ b/java/org/apache/el/util/ReflectionUtil.java
@@ -395,7 +395,11 @@
      */
     private static Method getMethod(Class<?> type, Object base, Method m) {
         JreCompat jreCompat = JreCompat.getInstance();
-        if (m == null || (Modifier.isPublic(type.getModifiers()) && jreCompat.canAcccess(base, m))) {
+        // If base is null, method MUST be static
+        // If base is non-null, method may be static or non-static
+        if (m == null ||
+                (Modifier.isPublic(type.getModifiers()) &&
+                        (jreCompat.canAcccess(base, m) || base != null && jreCompat.canAcccess(null, m)))) {
             return m;
         }
         Class<?>[] inf = type.getInterfaces();