From: mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 21 Apr 2004 07:25:14 +0000 (+0000)
Subject: 2004-04-21  Michael Koch  <konqueror@gmx.de>
X-Git-Tag: upstream/4.9.2~71716
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cfeee5ea6af2ead62188ccfb99fe06c8e7b45721;p=platform%2Fupstream%2Flinaro-gcc.git

2004-04-21  Michael Koch  <konqueror@gmx.de>

	* java/util/Properties.java
	(load): Fix wrongly merged fix.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@80949 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4b23a1f..c426ddb 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 8f0cbab..921d55c 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 '='