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 2017/12/23 13:43:36 UTC

svn commit: r1819148 - /tomcat/trunk/java/org/apache/el/parser/AstValue.java

Author: markt
Date: Sat Dec 23 13:43:36 2017
New Revision: 1819148

URL: http://svn.apache.org/viewvc?rev=1819148&view=rev
Log:
Simplify.
No functional change.

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=1819148&r1=1819147&r2=1819148&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstValue.java Sat Dec 23 13:43:36 2017
@@ -303,12 +303,11 @@ public final class AstValue extends Simp
         }
 
         if (m.isVarArgs()) {
-            Object[] varArgs = (Object[]) Array.newInstance(
-                    m.getParameterTypes()[paramCount - 1].getComponentType(),
-                    src.length - (paramCount - 1));
+            Class<?> varArgType = m.getParameterTypes()[paramCount - 1].getComponentType();
+            Object[] varArgs =
+                    (Object[]) Array.newInstance(varArgType, src.length - (paramCount - 1));
             for (int i = 0; i < src.length - (paramCount - 1); i ++) {
-                varArgs[i] = ELSupport.coerceToType(ctx, src[paramCount - 1 + i],
-                        types[paramCount - 1].getComponentType());
+                varArgs[i] = ELSupport.coerceToType(ctx, src[paramCount - 1 + i], varArgType);
             }
             dest[paramCount - 1] = varArgs;
         } else {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org