diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/text/CollationElementIterator.java | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 245e855..d85f3a3 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2003-06-19 Michael Koch <konqueror@gmx.de> + * java/text/CollationElementIterator.java + (NULLORDER): Initialize with -1 as JDK documentation says. + +2003-06-19 Michael Koch <konqueror@gmx.de> + * java/net/HttpURLConnection.java, java/net/Inet4Address.java, java/net/Inet6Address.java, diff --git a/libjava/java/text/CollationElementIterator.java b/libjava/java/text/CollationElementIterator.java index ba60f20..94c6500 100644 --- a/libjava/java/text/CollationElementIterator.java +++ b/libjava/java/text/CollationElementIterator.java @@ -1,6 +1,6 @@ /* CollationElementIterator.java -- Walks through collation elements + Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation -/* Copyright (C) 1999, 2001 Free Software Foundation This file is part of GNU Classpath. GNU Classpath is free software; you can redistribute it and/or modify @@ -60,7 +60,7 @@ public final class CollationElementIterator * This is a constant value that is returned to indicate that the end of * the string was encountered. */ - public static final int NULLORDER = 0xffffffff; + public static final int NULLORDER = -1; /** * This is the RuleBasedCollator this object was created from. @@ -92,6 +92,7 @@ public final class CollationElementIterator { if (index == text.length()) return NULLORDER; + return collator.ceiNext(this); } |