You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/09/21 15:40:57 UTC
svn commit: r1173636 - in /tomcat/tc7.0.x/trunk: ./
java/javax/el/BeanELResolver.java
test/javax/el/TestBeanELResolverVarargsInvocation.java
webapps/docs/changelog.xml
Author: markt
Date: Wed Sep 21 13:40:57 2011
New Revision: 1173636
URL: http://svn.apache.org/viewvc?rev=1173636&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51852
Correct 2 issues in varargs handling
- Incorrectly constructed varargs arguments (resulting in
ArrayIndexOutOfBoundsExceptions)
- Incorrectly detected matching varargs methods
Patch (with a test case!) provided by Matt Benson
Added:
tomcat/tc7.0.x/trunk/test/javax/el/TestBeanELResolverVarargsInvocation.java
- copied unchanged from r1173630, tomcat/trunk/test/javax/el/TestBeanELResolverVarargsInvocation.java
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/javax/el/BeanELResolver.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 21 13:40:57 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173096,1173241,1173256,1173288,1173614
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173096,1173241,1173256,1173288,1173614,1173630
Modified: tomcat/tc7.0.x/trunk/java/javax/el/BeanELResolver.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/el/BeanELResolver.java?rev=1173636&r1=1173635&r2=1173636&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/el/BeanELResolver.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/el/BeanELResolver.java Wed Sep 21 13:40:57 2011
@@ -420,7 +420,8 @@ public class BeanELResolver extends ELRe
matchingMethod = getMethod(clazz, m);
break;
}
- if (m.isVarArgs()) {
+ if (m.isVarArgs() && methodName.equals(m.getName()) &&
+ paramCount > m.getParameterTypes().length - 2 ) {
matchingMethod = getMethod(clazz, m);
}
}
@@ -440,21 +441,21 @@ public class BeanELResolver extends ELRe
if (matchingMethod.isVarArgs()) {
int varArgIndex = parameterTypes.length - 1;
// First argCount-1 parameters are standard
- for (int i = 0; (i < varArgIndex - 1); i++) {
+ for (int i = 0; (i < varArgIndex); i++) {
parameters[i] = factory.coerceToType(params[i],
parameterTypes[i]);
}
- // Last parameter is the varags
+ // Last parameter is the varargs
Class<?> varArgClass =
parameterTypes[varArgIndex].getComponentType();
+ final Object varargs = Array.newInstance(
+ varArgClass,
+ (paramCount - varArgIndex));
for (int i = (varArgIndex); i < paramCount; i++) {
- Object varargs = Array.newInstance(
- parameterTypes[paramCount],
- (paramCount - varArgIndex));
- Array.set(varargs, i,
+ Array.set(varargs, i - varArgIndex,
factory.coerceToType(params[i], varArgClass));
- parameters[varArgIndex] = varargs;
}
+ parameters[varArgIndex] = varargs;
} else {
parameters = new Object[parameterTypes.length];
for (int i = 0; i < parameterTypes.length; i++) {
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1173636&r1=1173635&r2=1173636&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Sep 21 13:40:57 2011
@@ -160,6 +160,13 @@
associated class from being unloaded until the JSP that replaced it was
itself unloaded. (markt)
</fix>
+ <fix>
+ <bug>51852</bug>: Correct two problems in the handling of varargs
+ methods with the BeanELResolver. The first meant the wrong method was
+ sometimes called and the second that an ArrayIndexOutOfBoundsExceptions
+ could be thrown. Patch (including a test case) provided by Matt Benson.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org