Fix java/lang/String.codePoint{At|Before} exception types

OpenJDK throws StringIndexOutOfBoundsException and so should we.

Signed-off-by: Pekka Enberg <penberg@kernel.org>

2 files changed, 10 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index c0d84cdf0..384918be8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-15  Pekka Enberg  <penberg@kernel.org>
+
+	* java/lang/String.java:
+	(codePointAt(int))): Fix exception type.
+	(codePointBefore(int)): Fix exception type.
+
 2011-07-20  Ivan Maidanski  <ivmai@mail.ru>
 
 	* 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);