felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From db...@apache.org
Subject svn commit: r804668 - /felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Reflective.java
Date Sun, 16 Aug 2009 11:40:02 GMT
Author: dbaum
Date: Sun Aug 16 11:40:02 2009
New Revision: 804668

URL: http://svn.apache.org/viewvc?rev=804668&view=rev
Log:
fix FELIX-1408
don't expand array args when coercing.
current expansion is wrong and agreed solution was to remove expansion completely.

Modified:
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Reflective.java

Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Reflective.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Reflective.java?rev=804668&r1=804667&r2=804668&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Reflective.java
(original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Reflective.java
Sun Aug 16 11:40:02 2009
@@ -187,20 +187,6 @@
                     // No match, check for varargs
                     if (types[i].isArray() && i == types.length - 1)
                     {
-
-                        // derek - expand final array arg
-                        if (i < in.size())
-                        {
-                            Object arg = in.get(i);
-                            if (arg instanceof List)
-                            {
-                                List<Object> args = (List<Object>) arg;
-                                in = new ArrayList<Object>(in);
-                                in.remove(i);
-                                in.addAll(args);
-                            }
-                        }
-
                         // Try to parse the remaining arguments in an array
                         Class<?> component = types[i].getComponentType();
                         Object components = Array.newInstance(component, in.size() - i);



Mime
View raw message