diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/util/zip/InflaterInputStream.java | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4fe67e2a9c1..2a525d1dcc1 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2000-08-23 Mark Wielaard <mark@klomp.org> + * java/util/zip/InflaterInputStream.java (read(byte[],int,int)): + return -1 when fill() has no more data for the Inflater. + +2000-08-23 Mark Wielaard <mark@klomp.org> + * java/io/PrintWriter.java (print(String)): Don't catch IOException, write(String) already does. diff --git a/libjava/java/util/zip/InflaterInputStream.java b/libjava/java/util/zip/InflaterInputStream.java index 92b897a32e4..e09f208349a 100644 --- a/libjava/java/util/zip/InflaterInputStream.java +++ b/libjava/java/util/zip/InflaterInputStream.java @@ -65,6 +65,8 @@ public class InflaterInputStream extends FilterInputStream return -1; if (inf.needsInput()) fill (); + if (this.len == -1) + return -1; // Couldn't get any more data to feed to the Inflater if (inf.needsDictionary()) return -1; try |