diff options
| author | Mark Wielaard <mark@klomp.org> | 2003-02-13 23:28:57 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@gcc.gnu.org> | 2003-02-13 23:28:57 +0000 |
| commit | 114775850c8a43ad478b7ec0b31252eaffb9200e (patch) | |
| tree | b7941689463b942e582cf141fc6b91939a2fadcc /libjava/java/io | |
| parent | 530ee84d755579fcd8505ee6edb8aa3994467e6f (diff) | |
| download | gcc-114775850c8a43ad478b7ec0b31252eaffb9200e.zip gcc-114775850c8a43ad478b7ec0b31252eaffb9200e.tar.gz gcc-114775850c8a43ad478b7ec0b31252eaffb9200e.tar.bz2 | |
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
Diffstat (limited to 'libjava/java/io')
| -rw-r--r-- | libjava/java/io/InputStreamReader.java | 7 | ||||
| -rw-r--r-- | libjava/java/io/OutputStreamWriter.java | 7 |
2 files changed, 10 insertions, 4 deletions
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) { |