diff options
| author | daney <daney@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-09 22:11:33 +0000 |
|---|---|---|
| committer | daney <daney@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-09 22:11:33 +0000 |
| commit | 824447de97ebe3acba902ad1adad06bebdc8639a (patch) | |
| tree | 6288b3f4fc2b8b47f82bdb4050df99906a36cf50 /libjava/java/io/InputStreamReader.java | |
| parent | be6f2308605cc394d803be75f9e68a2a6042ce61 (diff) | |
| download | ppe42-gcc-824447de97ebe3acba902ad1adad06bebdc8639a.tar.gz ppe42-gcc-824447de97ebe3acba902ad1adad06bebdc8639a.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96217 138bc75d-0d04-0410-961f-82ee72b054a4
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 ee03a5e6175..b3f65368ce3 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); |
