Commit 11477585 by Mark Wielaard Committed by Mark Wielaard

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
parent 530ee84d
2003-02-13 Mark Wielaard <mark@klomp.org> 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 * java/util/zip/InflaterInputStream.java (read): Return zero when len
is zero. is zero.
......
/* Copyright (C) 1998, 1999, 2001 Free Software Foundation /* Copyright (C) 1998, 1999, 2001, 2003 Free Software Foundation
This file is part of libgcj. This file is part of libgcj.
...@@ -70,7 +70,10 @@ public class InputStreamReader extends Reader ...@@ -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 public boolean ready() throws IOException
{ {
......
/* 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. This file is part of libgcj.
...@@ -28,7 +28,10 @@ public class OutputStreamWriter extends Writer ...@@ -28,7 +28,10 @@ public class OutputStreamWriter extends Writer
private char[] work; private char[] work;
private int wcount; private int wcount;
public String getEncoding() { return converter.getName(); } public String getEncoding()
{
return out != null ? converter.getName() : null;
}
private OutputStreamWriter(OutputStream out, UnicodeToBytes encoder) private OutputStreamWriter(OutputStream out, UnicodeToBytes encoder)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment