diff options
author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-02-13 18:55:13 +0000 |
---|---|---|
committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-02-13 18:55:13 +0000 |
commit | 4d90a5436c198848ebdd31184d3417b4e5caf378 (patch) | |
tree | c25167f3e73e64441f8cd01df631a5cab6684b6c /libjava/java/io/PipedReader.java | |
parent | 06afc7b70eb3af456fef1a60dee1b1ebbc37e2f9 (diff) | |
download | ppe42-gcc-4d90a5436c198848ebdd31184d3417b4e5caf378.tar.gz ppe42-gcc-4d90a5436c198848ebdd31184d3417b4e5caf378.zip |
* java/io/PipedReader.java (ready): Throw IOException if pipe
closed.
* java/io/FilterReader.java (close): Don't clear `in'.
* java/io/CharArrayReader.java (mark): Throw IOException if stream
closed.
(read, ready, reset, skip): Added exception message.
* java/io/BufferedReader.java (mark, reset, ready, read, skip):
Perform checkStatus check inside synchronized block.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@39641 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/io/PipedReader.java')
-rw-r--r-- | libjava/java/io/PipedReader.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libjava/java/io/PipedReader.java b/libjava/java/io/PipedReader.java index 8047d55a437..07569eb1dc1 100644 --- a/libjava/java/io/PipedReader.java +++ b/libjava/java/io/PipedReader.java @@ -312,10 +312,15 @@ public class PipedReader extends Reader public boolean ready() throws IOException { // The JDK 1.3 implementation does not appear to check for the closed or - // unconnected stream conditions here. + // unconnected stream conditions here. However, checking for a + // closed stream is explicitly required by the JDK 1.2 and 1.3 + // documentation (for Reader.close()), so we do it. synchronized (lock) { + if (closed) + throw new IOException("Pipe closed"); + if (in < 0) return false; |