summaryrefslogtreecommitdiffstats
path: root/luni/src
diff options
context:
space:
mode:
authorJesse Wilson <jessewilson@google.com>2011-10-14 11:01:30 -0400
committerJesse Wilson <jessewilson@google.com>2011-10-14 11:16:52 -0400
commitc8ed4009f3ade95e6cf9ade8cfd1b08f90a8690f (patch)
tree7573da13b71422fb1b0602053b9865831b351da3 /luni/src
parent63f7b99a47b05e0f85308fbf9697f7c678a47345 (diff)
downloadlibcore-c8ed4009f3ade95e6cf9ade8cfd1b08f90a8690f.zip
libcore-c8ed4009f3ade95e6cf9ade8cfd1b08f90a8690f.tar.gz
libcore-c8ed4009f3ade95e6cf9ade8cfd1b08f90a8690f.tar.bz2
Clean up exception throwing in Arrays.
Change-Id: Ie002ba1cd1c681b83c7a8d4e8d4f96b7c0350eef
Diffstat (limited to 'luni/src')
-rw-r--r--luni/src/main/java/java/util/Arrays.java13
1 files changed, 5 insertions, 8 deletions
diff --git a/luni/src/main/java/java/util/Arrays.java b/luni/src/main/java/java/util/Arrays.java
index 0e34f7f..0b52fd0 100644
--- a/luni/src/main/java/java/util/Arrays.java
+++ b/luni/src/main/java/java/util/Arrays.java
@@ -1739,17 +1739,14 @@ public class Arrays {
*
* @hide
*/
- public static void checkStartAndEnd(int arrayLength, int start, int end) {
+ public static void checkStartAndEnd(int len, int start, int end) {
+ if (start < 0 || end > len) {
+ throw new ArrayIndexOutOfBoundsException("start < 0 || end > len."
+ + " start=" + start + ", end=" + end + ", len=" + len);
+ }
if (start > end) {
throw new IllegalArgumentException("start > end: " + start + " > " + end);
}
- if (start < 0) {
- throw new ArrayIndexOutOfBoundsException("start < 0: " + start);
- }
- if (end > arrayLength) {
- throw new ArrayIndexOutOfBoundsException("end > array length: " +
- end + " > " + arrayLength);
- }
}
/**