Author: markt
Date: Thu Jun 10 20:11:29 2010
New Revision: 953440
URL: http://svn.apache.org/viewvc?rev=953440&view=rev
Log:
We already have the exact types. Don't try and derive them.
Modified:
tomcat/trunk/java/org/apache/el/parser/AstValue.java
Modified: tomcat/trunk/java/org/apache/el/parser/AstValue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstValue.java?rev=953440&r1=953439&r2=953440&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstValue.java Thu Jun 10 20:11:29
2010
@@ -246,12 +246,10 @@ public final class AstValue extends Simp
if (isParametersProvided()) {
values = ((AstMethodParameters)
this.jjtGetChild(2)).getParameters(ctx);
- Class<?>[] types = getTypesFromValues(values);
- m = ReflectionUtil.getMethod(t.base, t.property, types);
} else {
- m = ReflectionUtil.getMethod(t.base, t.property, paramTypes);
values = paramValues;
}
+ m = ReflectionUtil.getMethod(t.base, t.property, paramTypes);
Object result = null;
try {
result = m.invoke(t.base, values);
@@ -265,23 +263,6 @@ public final class AstValue extends Simp
return result;
}
- private Class<?>[] getTypesFromValues(Object[] values) {
- if (values == null) {
- return null;
- }
-
- Class<?> result[] = new Class<?>[values.length];
- for (int i = 0; i < values.length; i++) {
- if (values[i] == null) {
- result[i] = null;
- } else {
- result[i] = values[i].getClass();
- }
- }
- return result;
- }
-
-
/**
* @since EL 2.2
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
