Author: markt
Date: Tue Jul 5 10:42:15 2011
New Revision: 1142972
URL: http://svn.apache.org/viewvc?rev=1142972&view=rev
Log:
Revert r1142953. The analysis was incorrect.
Modified:
tomcat/trunk/java/javax/el/BeanELResolver.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/javax/el/BeanELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanELResolver.java?rev=1142972&r1=1142971&r2=1142972&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/BeanELResolver.java (original)
+++ tomcat/trunk/java/javax/el/BeanELResolver.java Tue Jul 5 10:42:15 2011
@@ -312,7 +312,7 @@ public class BeanELResolver extends ELRe
}
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();
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1142972&r1=1142971&r2=1142972&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jul 5 10:42:15 2011
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]