From b26a16ae6ec6c175c198bf3898071cc7f6908811 Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 10 Jun 2010 20:11:29 +0000 Subject: [PATCH] We already have the exact types. Don't try and derive them. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@953440 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/el/parser/AstValue.java | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/java/org/apache/el/parser/AstValue.java b/java/org/apache/el/parser/AstValue.java index fedf6d187..f87edd5af 100644 --- a/java/org/apache/el/parser/AstValue.java +++ b/java/org/apache/el/parser/AstValue.java @@ -246,12 +246,10 @@ public final class AstValue extends SimpleNode { 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 SimpleNode { 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 */ -- 2.11.0