summaryrefslogtreecommitdiff
path: root/libjava/java/util/ArrayList.java
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2002-04-07 07:40:49 +0000
committerMark Wielaard <mark@gcc.gnu.org>2002-04-07 07:40:49 +0000
commit236fc6a041778bf19cff62c6bc65706c4fa4b5a8 (patch)
treeefc2dd6dee0958f9f023d37fda7c28d454cb8596 /libjava/java/util/ArrayList.java
parent0154eaa8122a7a848fd40a79d30d3835508e2ab6 (diff)
ArrayList.java (addAll(int,Collection)): System.arraycopy all of the remaining elements.
* java/util/ArrayList.java (addAll(int,Collection)): System.arraycopy all of the remaining elements. * java/util/Vector.java (addAll(int,Collection)): Likewise. (removeRange): If toIndex == fromIndex do nothing, if toIndex < fromIndex throw IndexOutIfBoundsException. (removeAll): Always throw NullPointerException when collection is null. (retrainAll): Likewise. From-SVN: r51979
Diffstat (limited to 'libjava/java/util/ArrayList.java')
-rw-r--r--libjava/java/util/ArrayList.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/libjava/java/util/ArrayList.java b/libjava/java/util/ArrayList.java
index 59ce974b18f..99745d0f648 100644
--- a/libjava/java/util/ArrayList.java
+++ b/libjava/java/util/ArrayList.java
@@ -427,8 +427,8 @@ public class ArrayList extends AbstractList
if (csize + size > data.length)
ensureCapacity(size + csize);
int end = index + csize;
- if (index != size)
- System.arraycopy(data, index, data, end, csize);
+ if (size > 0 && index != size)
+ System.arraycopy(data, index, data, end, size - index);
size += csize;
for ( ; index < end; index++)
data[index] = itr.next();