Backport COLLECTIONS-350 to 3.2.2. git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_X@1713178 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/c2748821 Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/c2748821 Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/c2748821 Branch: refs/heads/COLLECTIONS_3_2_X Commit: c2748821619691f38e447a9f180af6823671fcaf Parents: 1908baa Author: Thomas Neidhart <t...@apache.org> Authored: Sat Nov 7 20:59:09 2015 +0000 Committer: Thomas Neidhart <t...@apache.org> Committed: Sat Nov 7 20:59:09 2015 +0000 ---------------------------------------------------------------------- src/changes/changes.xml | 6 +++--- src/java/org/apache/commons/collections/MapUtils.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-collections/blob/c2748821/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 8306efb..8695e33 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -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> http://git-wip-us.apache.org/repos/asf/commons-collections/blob/c2748821/src/java/org/apache/commons/collections/MapUtils.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/commons/collections/MapUtils.java b/src/java/org/apache/commons/collections/MapUtils.java index 9d38491..578d1b2 100644 --- a/src/java/org/apache/commons/collections/MapUtils.java +++ b/src/java/org/apache/commons/collections/MapUtils.java @@ -204,7 +204,7 @@ public class MapUtils { return NumberFormat.getInstance().parse(text); } catch (ParseException e) { - logInfo(e); + // failure means null is returned } } }
