summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--java/text/CollationElementIterator.java4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 924bd6bdc..e82a06b35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-01 Julian Dolby <dolby@us.ibm.com>
+
+ * java/text/CollationElementIterator.java (next):
+
2002-12-04 Tom Tromey <tromey@redhat.com>
* java/net/SocketPermission.java (hashCode): Rewrote.
diff --git a/java/text/CollationElementIterator.java b/java/text/CollationElementIterator.java
index b744c4e0a..d528d92a1 100644
--- a/java/text/CollationElementIterator.java
+++ b/java/text/CollationElementIterator.java
@@ -1,5 +1,5 @@
/* CollationElementIterator.java -- Walks through collation elements
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -280,7 +280,7 @@ public int
next()
{
++pos;
- if (pos == str.length())
+ if (pos >= str.length())
return(NULLORDER);
String s = str.charAt(pos) + "";