InputStreamReader.java (getEncoding): Return null when closed.

       * java/io/InputStreamReader.java (getEncoding): Return null when
       closed.
       * java/io/OutputStreamWriter.java (getEncoding): Likewise.

From-SVN: r62875

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index cf20ae01d23312a68c3ca0578636bdc8612e7ca2..cb8ea70e4529b6aadf6378fe4265c9286b1410a9 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-13  Mark Wielaard  <mark@klomp.org>
+
+       * java/io/InputStreamReader.java (getEncoding): Return null when
+       closed.
+       * java/io/OutputStreamWriter.java (getEncoding): Likewise.
+
 2003-02-13  Mark Wielaard  <mark@klomp.org>
  
        * java/util/zip/InflaterInputStream.java (read): Return zero when len

diff --git a/libjava/java/io/InputStreamReader.java b/libjava/java/io/InputStreamReader.java
index fff979c97acab641876cd4e6004f454d2a5c95cd..80272d01a22136d40f4644f79b3441aafc7caacb 100644 (file)
--- a/libjava/java/io/InputStreamReader.java
+++ b/libjava/java/io/InputStreamReader.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2001  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2001, 2003  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -70,7 +70,10 @@ public class InputStreamReader extends Reader
       }
   }
 
-  public String getEncoding() { return converter.getName(); }
+  public String getEncoding()
+  {
+    return in != null ? converter.getName() : null;
+  }
 
   public boolean ready() throws IOException
   {

diff --git a/libjava/java/io/OutputStreamWriter.java b/libjava/java/io/OutputStreamWriter.java
index 527ff75c66b6d41c1ac2f682cddb3ae290d84626..d49e104773a1a7738402bc5eda6c296defa5f306 100644 (file)
--- a/libjava/java/io/OutputStreamWriter.java
+++ b/libjava/java/io/OutputStreamWriter.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2000, 2001  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000, 2001, 2003  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -28,7 +28,10 @@ public class OutputStreamWriter extends Writer
   private char[] work;
   private int wcount;
 
-  public String getEncoding() { return converter.getName(); }
+  public String getEncoding()
+  {
+    return out != null ? converter.getName() : null;
+  }
 
   private OutputStreamWriter(OutputStream out, UnicodeToBytes encoder)
   {