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-334 to 3.2.2. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_X@1713294 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Neidhart 2015-11-08 21:07:13 +00:00
parent 6a7d35dea2
commit d75768a4b2
2 changed files with 6 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

@ -35,6 +35,9 @@
<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>
<action issue="COLLECTIONS-294" dev="bayard" type="fix" due-to="Benjamin Bentmann">
"CaseInsensitiveMap" will now convert input strings to lower-case in a
locale-independent manner.
@ -76,9 +79,6 @@
"ListUtils#intersection(List, List)" will now also work correctly if there
are duplicate elements in the provided lists.
</action>
<action issue="COLLECTIONS-334" dev="jochen" type="fix" due-to="sebb">
Synchronized access to lock in "StaticBucketMap#size()".
</action>
<action issue="COLLECTIONS-330" dev="mbenson" type="fix" due-to="Joerg Schaible">
"LRUMap#keySet()#remove(Object)" will not throw a "ConcurrentModificationException" anymore.
</action>

4
src/java/org/apache/commons/collections/map/StaticBucketMap.java
View File

@ -182,7 +182,9 @@ public final class StaticBucketMap implements Map {
int cnt = 0;
for (int i = 0; i < buckets.length; i++) {
cnt += locks[i].size;
synchronized(locks[i]) {
cnt += locks[i].size;
}
}
return cnt;
}