diff options
| author | mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-02-13 23:28:57 +0000 |
|---|---|---|
| committer | mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-02-13 23:28:57 +0000 |
| commit | 594aa8e1fdc0092bd75dbb30b7eee77d38fcac56 (patch) | |
| tree | b7941689463b942e582cf141fc6b91939a2fadcc /libjava/java/io | |
| parent | 846f36b8dcab199a4c2da5de68d5bc383afdb5fe (diff) | |
| download | ppe42-gcc-594aa8e1fdc0092bd75dbb30b7eee77d38fcac56.tar.gz ppe42-gcc-594aa8e1fdc0092bd75dbb30b7eee77d38fcac56.zip | |
* java/io/InputStreamReader.java (getEncoding): Return null when
closed.
* java/io/OutputStreamWriter.java (getEncoding): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@62875 138bc75d-0d04-0410-961f-82ee72b054a4
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 fff979c97ac..80272d01a22 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 527ff75c66b..d49e104773a 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) { |
