aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2001-09-11 03:13:07 +0000
committerTom Tromey <tromey@gcc.gnu.org>2001-09-11 03:13:07 +0000
commitfe5de1176eb897b568be6d0a04e580d4a029280a (patch)
treedb70e34d74d5432e39ed1b08f081b60bf3ce1670
parentfb530c07c16e5f5294341dd4675d833e951cf9a8 (diff)
downloadgcc-fe5de1176eb897b568be6d0a04e580d4a029280a.zip
gcc-fe5de1176eb897b568be6d0a04e580d4a029280a.tar.gz
gcc-fe5de1176eb897b568be6d0a04e580d4a029280a.tar.bz2
Properties.java (load): Correctly read \u sequences.
* java/util/Properties.java (load): Correctly read \u sequences. Report from Anthony Green. From-SVN: r45532
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/util/Properties.java4
2 files changed, 8 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8fd572e..8563193 100644
--- 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 5812173..457048c 100644
--- 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: