diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/util/Properties.java | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4b23a1fba8b..c426ddb2755 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2004-04-21 Michael Koch <konqueror@gmx.de> + + * java/util/Properties.java + (load): Fix wrongly merged fix. + 2004-04-21 Mark Wielaard <mark@klomp.org> * native/jni/gtk-peer/gthread-jni.c (maybe_rethrow): Explicitly diff --git a/libjava/java/util/Properties.java b/libjava/java/util/Properties.java index 8f0cbab385d..921d55c2150 100644 --- a/libjava/java/util/Properties.java +++ b/libjava/java/util/Properties.java @@ -194,8 +194,8 @@ label = Name:\\u0020</pre> pos++; // If empty line or begins with a comment character, skip this line. - if (line.length() == 0 - || line.charAt(0) == '#' || line.charAt(0) == '!') + if ((line.length() - pos) == 0 + || line.charAt(pos) == '#' || line.charAt(pos) == '!') continue; // The characters up to the next Whitespace, ':', or '=' |