From d70dd6c83509271f6a63d46bf6bc04d3d9fb2640 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Thu, 6 Sep 2001 17:16:09 +0000
Subject: [PATCH] * java/util/Properties.java: Re-merged from Classpath.

From-SVN: r45442
---
 libjava/ChangeLog                 |  2 ++
 libjava/java/util/Properties.java | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index fb2d75d5842..58e65ea5957 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,7 @@
 2001-09-05  Tom Tromey  <tromey@redhat.com>
 
+	* java/util/Properties.java: Re-merged from Classpath.
+
 	From Eric Blake, via Classpath:
 	* java/lang/String.java (CaseInsensitiveComparator): New class.
 	(CASE_INSENSITIVE_ORDER): Use instance of CaseInsensitiveComparator.
diff --git a/libjava/java/util/Properties.java b/libjava/java/util/Properties.java
index dc679faf126..5812173c91f 100644
--- a/libjava/java/util/Properties.java
+++ b/libjava/java/util/Properties.java
@@ -1,5 +1,5 @@
 /* java.util.Properties
-   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -61,7 +61,8 @@ import java.io.*;
  * of <code>get/put</code>.
  *
  * @see PropertyResourceBundle
- * @author Jochen Hoenicke */
+ * @author Jochen Hoenicke
+ */
 public class Properties extends Hashtable
 {
   /**
@@ -128,8 +129,9 @@ public class Properties extends Hashtable
    * from the input.  */
   public void load(InputStream inStream) throws IOException
   {
+    // The spec says that the file must be encoded using ISO-8859-1.
     BufferedReader reader =
-      new BufferedReader(new InputStreamReader(inStream));
+      new BufferedReader(new InputStreamReader(inStream, "ISO-8859-1"));
     String line;
     
     while ((line = reader.readLine()) != null)
@@ -302,7 +304,9 @@ public class Properties extends Hashtable
    */
   public void store(OutputStream out, String header) throws IOException
   {
-    PrintWriter writer = new PrintWriter(out);
+    // The spec says that the file must be encoded using ISO-8859-1.
+    PrintWriter writer
+      = new PrintWriter(new OutputStreamWriter (out, "ISO-8859-1"));
     if (header != null)
       writer.println("#" + header);
     writer.println("#" + new Date().toString());