commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t.@apache.org
Subject svn commit: r1494275 - /commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/MapUtils.java
Date Tue, 18 Jun 2013 20:02:36 GMT
Author: tn
Date: Tue Jun 18 20:02:36 2013
New Revision: 1494275

URL: http://svn.apache.org/r1494275
Log:
Revert varargs parameter to plain array as it breaks tests on jdk 1.5 and 1.6.

Modified:
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/MapUtils.java

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/MapUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/MapUtils.java?rev=1494275&r1=1494274&r2=1494275&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/MapUtils.java
(original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/MapUtils.java
Tue Jun 18 20:02:36 2013
@@ -1140,7 +1140,7 @@ public class MapUtils {
      * @since 3.2
      */
     @SuppressWarnings("unchecked") // As per Javadoc throws CCE for invalid array contents
-    public static <K, V> Map<K, V> putAll(final Map<K, V> map, final Object...
array) {
+    public static <K, V> Map<K, V> putAll(final Map<K, V> map, final Object[]
array) {
         map.size();  // force NPE
         if (array == null || array.length == 0) {
             return map;



Mime
View raw message