Revert r1142953. The analysis was incorrect.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1142972 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/javax/el/BeanELResolver.java b/java/javax/el/BeanELResolver.java
index c525bb5..7ba9ce0 100644 (file)
--- a/java/javax/el/BeanELResolver.java
+++ b/java/javax/el/BeanELResolver.java
@@ -312,7 +312,7 @@ public class BeanELResolver extends ELResolver {
     }
 
     private static final Method getMethod(Class<?> type, Method m) {
-        if (m == null || Modifier.isPublic(m.getModifiers())) {
+        if (m == null || Modifier.isPublic(type.getModifiers())) {
             return m;
         }
         Class<?>[] inf = type.getInterfaces();

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 04cf301..b517ec2 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -88,14 +88,6 @@
       </fix>
     </changelog>
   </subsection>
-  <subsection name="Jasper">
-    <changelog>
-      <fix>
-        <bug>51472</bug>: Correctly test modifiers when resolving bean methods
-        with the BeanELResolver. Patch provided by Friedhelm Kuehn. (markt)
-      </fix>
-    </changelog>
-  </subsection>
   <subsection name="Other">
     <changelog>
       <fix>