Vector.java (ensureCapacity): Don't increment modCount.

2000-11-27  Bryce McKinlay  <bryce@albatross.co.nz>

	* java/util/Vector.java (ensureCapacity): Don't increment modCount.
	(addElement): Don't increment elementCount twice. Doh.
	* java/util/ArrayList.java (add): Only call ensureCapacity if the
	array needs to be expanded.
	(addAll): Ditto.
	* java/util/Collections.java (UnmodifiableCollection): Implement
	toString().
	(UnmodifiableList): Throw UnsupportedOperationException from
	modification methods. Set `l' from the one-parameter constructor.
	(UnmodifiableMap): Implement toString().
	(SynchronizedCollection): Ditto.
	(SynchronizedList): Set `l' from the one-parameter constructor.
	(SynchronizedSortedSet): Set `ss' from the one-parameter constructor.
	(SynchronizedMap): Implement toString().

From-SVN: r37785

1 files changed, 1 insertions, 2 deletions

diff --git a/libjava/java/util/Vector.java b/libjava/java/util/Vector.java
index cd0a763a3aa..06d2ebefe02 100644
--- a/libjava/java/util/Vector.java
+++ b/libjava/java/util/Vector.java
@@ -178,7 +178,6 @@ public class Vector extends AbstractList
    */
   public synchronized void ensureCapacity(int minCapacity)
   {
-    modCount++;
     if (elementData.length >= minCapacity)
       return;
 
@@ -459,7 +458,7 @@ public class Vector extends AbstractList
   public synchronized void addElement(Object obj)
   {
     if (elementCount == elementData.length)
-      ensureCapacity(++elementCount);
+      ensureCapacity(elementCount + 1);
     modCount++;
     elementData[elementCount++] = obj;
   }