commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t.@apache.org
Subject svn commit: r1713178 - in /commons/proper/collections/branches/COLLECTIONS_3_2_X/src: changes/changes.xml java/org/apache/commons/collections/MapUtils.java
Date Sat, 07 Nov 2015 20:59:10 GMT
Author: tn
Date: Sat Nov  7 20:59:09 2015
New Revision: 1713178

URL: http://svn.apache.org/viewvc?rev=1713178&view=rev
Log:
Backport COLLECTIONS-350 to 3.2.2.

Modified:
    commons/proper/collections/branches/COLLECTIONS_3_2_X/src/changes/changes.xml
    commons/proper/collections/branches/COLLECTIONS_3_2_X/src/java/org/apache/commons/collections/MapUtils.java

Modified: commons/proper/collections/branches/COLLECTIONS_3_2_X/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/collections/branches/COLLECTIONS_3_2_X/src/changes/changes.xml?rev=1713178&r1=1713177&r2=1713178&view=diff
==============================================================================
--- commons/proper/collections/branches/COLLECTIONS_3_2_X/src/changes/changes.xml (original)
+++ commons/proper/collections/branches/COLLECTIONS_3_2_X/src/changes/changes.xml Sat Nov
 7 20:59:09 2015
@@ -23,6 +23,9 @@
 
   <release version="3.2.2" date="20XX-XX-XX" description="This is a bugfix release.">
 
+    <action issue="COLLECTIONS-350" dev="bayard" type="fix" due-to="Michael Akerman">
+      Removed debug output in "MapUtils#getNumber(Map)".
+    </action>
     <action issue="COLLECTIONS-335" dev="jochen" type="fix" due-to="sebb">
       Fixed cache assignment for "TreeBidiMap#entrySet".
     </action>
@@ -55,9 +58,6 @@
       "ListUtils#intersection(List, List)" will now also work correctly if there
       are duplicate elements in the provided lists.
     </action>
-    <action issue="COLLECTIONS-350" dev="bayard" type="fix" due-to="Michael Akerman">
-      Removed debug output in "MapUtils#getNumber(Map)".
-    </action>
     <action issue="COLLECTIONS-334" dev="jochen" type="fix" due-to="sebb">
       Synchronized access to lock in "StaticBucketMap#size()".
     </action>

Modified: commons/proper/collections/branches/COLLECTIONS_3_2_X/src/java/org/apache/commons/collections/MapUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/branches/COLLECTIONS_3_2_X/src/java/org/apache/commons/collections/MapUtils.java?rev=1713178&r1=1713177&r2=1713178&view=diff
==============================================================================
--- commons/proper/collections/branches/COLLECTIONS_3_2_X/src/java/org/apache/commons/collections/MapUtils.java
(original)
+++ commons/proper/collections/branches/COLLECTIONS_3_2_X/src/java/org/apache/commons/collections/MapUtils.java
Sat Nov  7 20:59:09 2015
@@ -204,7 +204,7 @@ public class MapUtils {
                         return NumberFormat.getInstance().parse(text);
                         
                     } catch (ParseException e) {
-                        logInfo(e);
+                        // failure means null is returned
                     }
                 }
             }



Mime
View raw message