You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ch...@apache.org on 2017/07/11 17:55:35 UTC
[05/50] commons-collections git commit: Backport COLLECTIONS-335 to
3.2.2.
Backport COLLECTIONS-335 to 3.2.2.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_X@1713173 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/98762430
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/98762430
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/98762430
Branch: refs/heads/COLLECTIONS_3_2_X
Commit: 9876243087c38d583924cab592a705967860f67b
Parents: 16b1e26
Author: Thomas Neidhart <tn...@apache.org>
Authored: Sat Nov 7 20:31:09 2015 +0000
Committer: Thomas Neidhart <tn...@apache.org>
Committed: Sat Nov 7 20:31:09 2015 +0000
----------------------------------------------------------------------
src/changes/changes.xml | 6 +++---
.../org/apache/commons/collections/bidimap/TreeBidiMap.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/98762430/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f278a9d..69031da 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-335" dev="jochen" type="fix" due-to="sebb">
+ Fixed cache assignment for "TreeBidiMap#entrySet".
+ </action>
<action issue="COLLECTIONS-249" dev="bayard" type="fix" due-to="Joe Kelly">
"SetUniqueList.addAll(int, Collection)" now correctly add the collection at the
provided index.
@@ -51,9 +54,6 @@
<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>
<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/98762430/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java b/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
index 0a630af..ee42540 100644
--- a/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
@@ -392,7 +392,7 @@ public class TreeBidiMap implements OrderedBidiMap {
*/
public Set entrySet() {
if (entrySet == null) {
- return new EntryView(this, KEY, MAPENTRY);
+ entrySet = new EntryView(this, KEY, MAPENTRY);
}
return entrySet;
}