From: Mark Wielaard <mark@klomp.org>
Date: Sun, 2 Mar 2003 22:36:20 +0000 (+0000)
Subject: Properties.java (load): Only skip line if the first character is a comment, whitespac... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bd3f5371a452ee7d8e56f69c36258d8ed8061777;p=gcc.git

Properties.java (load): Only skip line if the first character is a comment, whitespaces don't count.

       * java/util/Properties.java (load): Only skip line if the first
       character is a comment, whitespaces don't count.

From-SVN: r63700
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4d7e2070efb..d76dfe7bf69 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-02  Mark Wielaard  <mark@klomp.org>
+
+	* java/util/Properties.java (load): Only skip line if the first
+	character is a comment, whitespaces don't count.
+
 2003-03-02  Michael Koch  <konqueror@gmx.de>
 
 	* java/net/NetPermission.java:
diff --git a/libjava/java/util/Properties.java b/libjava/java/util/Properties.java
index 279cf1e7b82..52ca144cb70 100644
--- a/libjava/java/util/Properties.java
+++ b/libjava/java/util/Properties.java
@@ -188,13 +188,17 @@ label   = Name:\\u0020</pre>
       {
         char c = 0;
         int pos = 0;
+        // If empty line or begins with a comment character, skip this line.
+        if (line.length() == 0
+	    || line.charAt(0) == '#' || line.charAt(0) == '!')
+          continue;
+
         while (pos < line.length()
                && Character.isWhitespace(c = line.charAt(pos)))
           pos++;
 
-        // If line is empty or begins with a comment character,
-        // skip this line.
-        if (pos == line.length() || c == '#' || c == '!')
+        // If line is empty skip this line.
+        if (pos == line.length())
           continue;
 
         // The characters up to the next Whitespace, ':', or '='