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

diff --git a/java/org/apache/el/parser/AstValue.java b/java/org/apache/el/parser/AstValue.java
index fedf6d1..f87edd5 100644 (file)
--- 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
      */