svn commit: r1366195 - in /commons/proper/collections/trunk/src: changes/changes.xml main/java/org/apache/commons/collections/iterators/CollatingIterator.java

[tn...@apache.org]

Author: tn
Date: Thu Jul 26 20:50:27 2012
New Revision: 1366195

URL: http://svn.apache.org/viewvc?rev=1366195&view=rev
Log:
Add change for 3.2.2 also for 4.0 release, fix javadoc for COLLECTIONS-331.

Modified:
    commons/proper/collections/trunk/src/changes/changes.xml
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java

Modified: commons/proper/collections/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/changes/changes.xml?rev=1366195&r1=1366194&r2=1366195&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/changes/changes.xml (original)
+++ commons/proper/collections/trunk/src/changes/changes.xml Thu Jul 26 20:50:27 2012
@@ -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>

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java?rev=1366195&r1=1366194&r2=1366195&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java Thu Jul 26 20:50:27 2012
@@ -346,7 +346,7 @@ public class CollatingIterator<E> implem
      * 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> implem
                 } 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;