Apache
/
commons-collections
mirror of https://github.com/apache/commons-collections.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Thomas Neidhart 2015-11-07 20:31:09 +00:00
parent 16b1e26bd1
commit 9876243087
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/changes/changes.xml
View File

@ -23,6 +23,9 @@
<release version="3.2.2" date="20XX-XX-XX" description="This is a bugfix release."> <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"> <action issue="COLLECTIONS-249" dev="bayard" type="fix" due-to="Joe Kelly">
"SetUniqueList.addAll(int, Collection)" now correctly add the collection at the "SetUniqueList.addAll(int, Collection)" now correctly add the collection at the
provided index. provided index.
@ -51,9 +54,6 @@
<action issue="COLLECTIONS-350" dev="bayard" type="fix" due-to="Michael Akerman"> <action issue="COLLECTIONS-350" dev="bayard" type="fix" due-to="Michael Akerman">
Removed debug output in "MapUtils#getNumber(Map)". Removed debug output in "MapUtils#getNumber(Map)".
</action> </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"> <action issue="COLLECTIONS-334" dev="jochen" type="fix" due-to="sebb">
Synchronized access to lock in "StaticBucketMap#size()". Synchronized access to lock in "StaticBucketMap#size()".
</action> </action>

2
src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
View File

@ -392,7 +392,7 @@ public class TreeBidiMap implements OrderedBidiMap {
*/ */
public Set entrySet() { public Set entrySet() {
if (entrySet == null) { if (entrySet == null) {
return new EntryView(this, KEY, MAPENTRY); entrySet = new EntryView(this, KEY, MAPENTRY);
} }
return entrySet; return entrySet;
} }