diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/io/InputStreamReader.java | 7 | ||||
| -rw-r--r-- | libjava/java/io/OutputStreamWriter.java | 7 |
3 files changed, 16 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index cf20ae0..cb8ea70 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,4 +1,10 @@ 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 is zero. diff --git a/libjava/java/io/InputStreamReader.java b/libjava/java/io/InputStreamReader.java index fff979c..80272d0 100644 --- 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 527ff75..d49e104 100644 --- 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) { |