From: Mark Wielaard <mark@klomp.org>
Date: Sat, 6 Apr 2002 08:26:08 +0000 (+0000)
Subject: ArrayList.jva (removeRange): If toIndex == fromIndex do nothing...
X-Git-Tag: releases/gcc-3.3.0~5859
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e9603b0c204c9ea0099bc379be3de18da9f9488;p=thirdparty%2Fgcc.git

ArrayList.jva (removeRange): If toIndex == fromIndex do nothing...

        * java/util/ArrayList.jva (removeRange): If toIndex == fromIndex do
        nothing, if toIndex < fromIndex throw IndexOutIfBoundsException.

From-SVN: r51947
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3c356d44800c..a48ba5157501 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-05  Mark Wielaard <mark@klomp.org>
+
+	* java/util/ArrayList.jva (removeRange): If toIndex == fromIndex do
+	nothing, if toIndex < fromIndex throw IndexOutIfBoundsException.
+
 2002-04-05  Adam Megacz <adam@xwt.org>
 
         * exception.cc (abort): added static modifier
diff --git a/libjava/java/util/ArrayList.java b/libjava/java/util/ArrayList.java
index 34dc48ac1790..59ce974b18f5 100644
--- a/libjava/java/util/ArrayList.java
+++ b/libjava/java/util/ArrayList.java
@@ -437,19 +437,23 @@ public class ArrayList extends AbstractList
 
   /**
    * Removes all elements in the half-open interval [fromIndex, toIndex).
-   * You asked for it if you call this with invalid arguments.
+   * Does nothing when toIndex is equal to fromIndex.
    *
    * @param fromIndex the first index which will be removed
    * @param toIndex one greater than the last index which will be removed
+   * @throws IndexOutOfBoundsException if fromIndex &gt; toIndex
    */
   protected void removeRange(int fromIndex, int toIndex)
   {
-    if (fromIndex != toIndex)
+    int change = toIndex - fromIndex;
+    if (change > 0)
       {
         modCount++;
         System.arraycopy(data, toIndex, data, fromIndex, size - toIndex);
-        size -= toIndex - fromIndex;
+        size -= change;
       }
+    else if (change < 0)
+      throw new IndexOutOfBoundsException();
   }
 
   /**