2002-12-21 Eric Blake <ebb9@email.byu.edu>

	* java/util/TreeMap.java (fabricateTree): Fix off-by-one error.
	(TreeIterator.remove): Prefer IllegalStateException over
	ConcurrentModificationException, to match Sun.

2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 89a1b5a97..5fe5ce7d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-21  Eric Blake  <ebb9@email.byu.edu>
+
+	* java/util/TreeMap.java (fabricateTree): Fix off-by-one error.
+	(TreeIterator.remove): Prefer IllegalStateException over
+	ConcurrentModificationException, to match Sun.
+
 2002-12-21  Michael Koch  <konqueror@gmx.de>
 
 	* java/nio/channels/FileChannel.java
diff --git a/java/util/TreeMap.java b/java/util/TreeMap.java
index dfa9bc638..e0cff28e0 100644
--- a/java/util/TreeMap.java
+++ b/java/util/TreeMap.java
@@ -865,7 +865,7 @@ public class TreeMap extends AbstractMap
     int rowsize;
 
     // Fill each row that is completely full of nodes.
-    for (rowsize = 2; rowsize + rowsize < count; rowsize <<= 1)
+    for (rowsize = 2; rowsize + rowsize <= count; rowsize <<= 1)
       {
         Node parent = row;
         Node last = null;
@@ -1468,10 +1468,10 @@ public class TreeMap extends AbstractMap
      */
     public void remove()
     {
-      if (knownMod != modCount)
-        throw new ConcurrentModificationException();
       if (last == null)
         throw new IllegalStateException();
+      if (knownMod != modCount)
+        throw new ConcurrentModificationException();
 
       removeNode(last);
       last = null;