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:
parent
bc715edab3
commit
4303c163b1
|
@ -35,6 +35,24 @@
|
||||||
Changed behavior of "CaseInsensitiveMap" constructor to be compliant with "HashMap"
|
Changed behavior of "CaseInsensitiveMap" constructor to be compliant with "HashMap"
|
||||||
in case the initial capacity is set to zero.
|
in case the initial capacity is set to zero.
|
||||||
</action>
|
</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>
|
</release>
|
||||||
</body>
|
</body>
|
||||||
</document>
|
</document>
|
||||||
|
|
|
@ -346,7 +346,7 @@ public class CollatingIterator<E> implements Iterator<E> {
|
||||||
* Returns the index of the least element in {@link #values},
|
* Returns the index of the least element in {@link #values},
|
||||||
* {@link #set(int) setting} any uninitialized values.
|
* {@link #set(int) setting} any uninitialized values.
|
||||||
*
|
*
|
||||||
* @throws IllegalStateException
|
* @throws NullPointerException if no comparator is set
|
||||||
*/
|
*/
|
||||||
private int least() {
|
private int least() {
|
||||||
int leastIndex = -1;
|
int leastIndex = -1;
|
||||||
|
@ -362,7 +362,7 @@ public class CollatingIterator<E> implements Iterator<E> {
|
||||||
} else {
|
} else {
|
||||||
E curObject = values.get(i);
|
E curObject = values.get(i);
|
||||||
if (comparator == null) {
|
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) {
|
if (comparator.compare(curObject, leastObject) < 0) {
|
||||||
leastObject = curObject;
|
leastObject = curObject;
|
||||||
|
|
Loading…
Reference in New Issue