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

Add change for 3.2.2 also for 4.0 release, fix javadoc for COLLECTIONS-331. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1366195 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Neidhart 2012-07-26 20:50:27 +00:00
parent bc715edab3
commit 4303c163b1
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/changes/changes.xml
View File

@ -35,6 +35,24 @@
Changed behavior of "CaseInsensitiveMap" constructor to be compliant with "HashMap"
in case the initial capacity is set to zero.
</action>
<action dev="jochen" issue="COLLECTIONS-334" type="fix" due-to="sebb">
Synchronized access to lock in "StaticBucketMap#size()".
</action>
<action dev="jochen" issue="COLLECTIONS-335" type="fix" due-to="sebb">
Fixed cache assignment for "TreeBidiMap#entrySet".
</action>
<action dev="jochen" issue="COLLECTIONS-332" type="fix" due-to="Tom Parker">
Added clarification to javadoc of "ListOrderedMap" that "IdentityMap" and
"CaseInsensitiveMap" are not supported.
</action>
<action dev="jochen" issue="COLLECTIONS-360" type="fix" due-to="Sai Zhang">
"FilterListIterator#hasNext" does not throw a NullPointerException anymore
to comply to the Java iterator specification.
</action>
<action dev="jochen" issue="COLLECTIONS-331" type="fix" due-to="Michael Krkoska">
Improve javadoc of "CollatingIterator" wrt the used "Comparator" and throw a
NullPointerException in "CollatingIterator#least" if no comparator is set.
</action>
</release>
</body>
</document>

4
src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java
View File

@ -346,7 +346,7 @@ public class CollatingIterator<E> implements Iterator<E> {
* Returns the index of the least element in {@link #values},
* {@link #set(int) setting} any uninitialized values.
*
* @throws IllegalStateException
* @throws NullPointerException if no comparator is set
*/
private int least() {
int leastIndex = -1;
@ -362,7 +362,7 @@ public class CollatingIterator<E> implements Iterator<E> {
} else {
E curObject = values.get(i);
if (comparator == null) {
throw new NullPointerException("You must invoke setComparator() to set a compator first.");
throw new NullPointerException("You must invoke setComparator() to set a comparator first.");
}
if (comparator.compare(curObject, leastObject) < 0) {
leastObject = curObject;