From 012ca3e055dbc6ce0b9aa33d095e63ff3baba1b0 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 6 Aug 2001 22:01:32 +0000 Subject: [PATCH] InputStreamReader.java (refill): Only call refill on BufferedInputStream when appropriate constraints are met. * java/io/InputStreamReader.java (refill): Only call refill on BufferedInputStream when appropriate constraints are met. From-SVN: r44675 --- libjava/ChangeLog | 5 +++++ libjava/java/io/InputStreamReader.java | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c32cf36d691..270500db317 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2001-08-06 Tom Tromey + + * java/io/InputStreamReader.java (refill): Only call refill on + BufferedInputStream when appropriate constraints are met. + 2001-08-05 Tom Tromey * java/io/StringWriter.java: Merged with Classpath. diff --git a/libjava/java/io/InputStreamReader.java b/libjava/java/io/InputStreamReader.java index 45fd59821ec..fff979c97ac 100644 --- a/libjava/java/io/InputStreamReader.java +++ b/libjava/java/io/InputStreamReader.java @@ -149,7 +149,9 @@ public class InputStreamReader extends Reader // We have knowledge of the internals of BufferedInputStream // here. Eww. in.mark (0); - boolean r = in.refill (); + // BufferedInputStream.refill() can only be called when + // `pos>=count'. + boolean r = in.pos < in.count || in.refill (); in.reset (); if (! r) return false; -- 2.30.2