diff options
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/util/Vector.java | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 3a1b794..1d6972a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2000-12-01 Tom Tromey <tromey@redhat.com> + + * java/util/Vector.java (insertElementAt): Unconditionally + increment elementCount. + (removeRange): Clear unused slots in vector. + 2000-12-02 Bryce McKinlay <bryce@albatross.co.nz> * java/lang/natMath.cc: Declare fabsf() function. diff --git a/libjava/java/util/Vector.java b/libjava/java/util/Vector.java index 06d2ebe..1678590 100644 --- a/libjava/java/util/Vector.java +++ b/libjava/java/util/Vector.java @@ -440,8 +440,9 @@ public class Vector extends AbstractList throw new ArrayIndexOutOfBoundsException(index + " > " + elementCount); if (elementCount == elementData.length) - ensureCapacity(++elementCount); - modCount++; + ensureCapacity(elementCount + 1); + ++modCount; + ++elementCount; System.arraycopy(elementData, index, elementData, index + 1, elementCount - 1 - index); elementData[index] = obj; @@ -755,7 +756,11 @@ public class Vector extends AbstractList { System.arraycopy(elementData, toIndex, elementData, fromIndex, elementCount - toIndex); + // Clear unused elements so objects can be collected. + int save = elementCount; elementCount -= (toIndex - fromIndex); + for (int i = elementCount; i < save; ++i) + elementData[i] = null; } } } |