From 114775850c8a43ad478b7ec0b31252eaffb9200e Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 13 Feb 2003 23:28:57 +0000 Subject: [PATCH] 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 --- libjava/ChangeLog | 6 ++++++ libjava/java/io/InputStreamReader.java | 7 +++++-- libjava/java/io/OutputStreamWriter.java | 7 +++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index cf20ae01d23..cb8ea70e452 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2003-02-13 Mark Wielaard + + * java/io/InputStreamReader.java (getEncoding): Return null when + closed. + * java/io/OutputStreamWriter.java (getEncoding): Likewise. + 2003-02-13 Mark Wielaard * 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 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) { -- 2.30.2