diff options
| author | David Daney <ddaney@avtrex.com> | 2005-03-09 22:11:33 +0000 |
|---|---|---|
| committer | David Daney <daney@gcc.gnu.org> | 2005-03-09 22:11:33 +0000 |
| commit | fc6b4aa43ad3dfdb630b6bbdd441dad923fa90b9 (patch) | |
| tree | 6288b3f4fc2b8b47f82bdb4050df99906a36cf50 /libjava/java/io/InputStreamReader.java | |
| parent | 9c90a97e936f00e67938ba115719fe7dda5c545e (diff) | |
| download | gcc-fc6b4aa43ad3dfdb630b6bbdd441dad923fa90b9.zip gcc-fc6b4aa43ad3dfdb630b6bbdd441dad923fa90b9.tar.gz gcc-fc6b4aa43ad3dfdb630b6bbdd441dad923fa90b9.tar.bz2 | |
re PR libgcj/20389 (BufferedInputStream gets ArrayIndexOutOfBoundsExeception)
2005-03-09 David Daney <ddaney@avtrex.com>
PR libgcj/20389
Merge BufferedInputStream from GNU Classpath.
* java/io/BufferedInputStream.java (marktarget): Field removed.
(CHUNKSIZE): Field removed.
(bufferSize): New field.
(BufferedInputStream): Initialize fields.
(close): Invalidate mark and buffer indexes.
(mark): Rewritten.
(read()): Move mark handling code to refill.
(read(byte[], int, int)): Ditto.
(skip): Ditto and simplify EOF testing.
(refill): Rewritten.
* java/io/InputStreamReader.java (refill): Removed mark and reset
of internal BufferedInputStream.
From-SVN: r96217
Diffstat (limited to 'libjava/java/io/InputStreamReader.java')
| -rw-r--r-- | libjava/java/io/InputStreamReader.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libjava/java/io/InputStreamReader.java b/libjava/java/io/InputStreamReader.java index ee03a5e..b3f6536 100644 --- a/libjava/java/io/InputStreamReader.java +++ b/libjava/java/io/InputStreamReader.java @@ -282,11 +282,9 @@ public class InputStreamReader extends Reader { // We have knowledge of the internals of BufferedInputStream // here. Eww. - in.mark (0); // BufferedInputStream.refill() can only be called when // `pos>=count'. boolean r = in.pos < in.count || in.refill (); - in.reset (); if (! r) return -1; converter.setInput(in.buf, in.pos, in.count); |