From a1e2fbeff01860fc2c7ad5c8a0a6982e5ca14b95 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Thu, 15 Mar 2012 22:13:03 +0200 Subject: Fix java/lang/String.codePoint{At|Before} exception types OpenJDK throws StringIndexOutOfBoundsException and so should we. Signed-off-by: Pekka Enberg --- ChangeLog | 6 ++++++ java/lang/String.java | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index c0d84cdf0..384918be8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-03-15 Pekka Enberg + + * java/lang/String.java: + (codePointAt(int))): Fix exception type. + (codePointBefore(int)): Fix exception type. + 2011-07-20 Ivan Maidanski * native/jni/java-util/java_util_VMTimeZone.c: diff --git a/java/lang/String.java b/java/lang/String.java index 45c0daff6..eb713ce2a 100644 --- a/java/lang/String.java +++ b/java/lang/String.java @@ -705,6 +705,8 @@ public final class String */ public synchronized int codePointAt(int index) { + if (index < 0 || index >= count) + throw new StringIndexOutOfBoundsException(index); // Use the CharSequence overload as we get better range checking // this way. return Character.codePointAt(this, index); @@ -722,6 +724,8 @@ public final class String */ public synchronized int codePointBefore(int index) { + if (index < 0 || index >= count) + throw new StringIndexOutOfBoundsException(index); // Use the CharSequence overload as we get better range checking // this way. return Character.codePointBefore(this, index); -- cgit v1.2.1