Properties.java (load): Correctly read \u sequences.

	* java/util/Properties.java (load): Correctly read \u sequences.
	Report from Anthony Green.

From-SVN: r45532

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8fd572e4583eefb0cdfedcd70686fb74ce8cbebb..85631936032a8c945d91ef6d9096b82e3a2b5fc0 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-10  Tom Tromey  <tromey@redhat.com>
+
+       * java/util/Properties.java (load): Correctly read \u sequences.
+       Report from Anthony Green.
+
 2001-09-10  Manfred Hollstein  <manfredh@redhat.com>
 
        * configure.in (LIBFFIINCS): Quote uses of $(top_srcdir)

diff --git a/libjava/java/util/Properties.java b/libjava/java/util/Properties.java
index 5812173c91ff4bcb15273854248b573be2a430e0..457048c1d096bc13320235baf6cd79277185bfba 100644 (file)
--- a/libjava/java/util/Properties.java
+++ b/libjava/java/util/Properties.java
@@ -147,7 +147,7 @@ public class Properties extends Hashtable
        if (pos == line.length() || c == '#' || c == '!')
          continue;
 
-       // The characaters up to the next Whitespace, ':', or '='
+       // The characters up to the next Whitespace, ':', or '='
        // describe the key.  But look for escape sequences.
        StringBuffer key = new StringBuffer();
        while (pos < line.length()
@@ -185,6 +185,7 @@ public class Properties extends Hashtable
                            char uni = (char) Integer.parseInt
                              (line.substring(pos, pos + 4), 16);
                            key.append(uni);
+                           pos += 4;
                          }     // else throw exception?
                        break;
                      default:
@@ -247,6 +248,7 @@ public class Properties extends Hashtable
                            char uni = (char) Integer.parseInt
                              (line.substring(pos, pos + 4), 16);
                            element.append(uni);
+                           pos += 4;
                          }     // else throw exception?
                        break;
                      default: