[cp-patches] [PATCH] Fix java/lang/String.codePoint{At|Before} exception types

[Pekka Enberg]

OpenJDK throws StringIndexOutOfBoundsException and so should we.

Signed-off-by: Pekka Enberg <penb...@kernel.org>
---
 ChangeLog             |    6 ++++++
 java/lang/String.java |    4 ++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cce9803..0a867cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2012-03-15  Pekka Enberg  <penb...@kernel.org>
 
+       * java/lang/String.java:
+       (codePointAt): Fix exception type.
+       (codePointBefore): Fix exception type.
+
+2012-03-15  Pekka Enberg  <penb...@kernel.org>
+
        * java/util/Formatter.java:
        (format): Fix NPE errors.
 
diff --git a/java/lang/String.java b/java/lang/String.java
index 45c0daf..eb713ce 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);
-- 
1.7.6.5