From 309bf2960a40848b7dd08dfa45e98b88ac16fcc2 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 24 Aug 2000 22:48:12 +0000 Subject: [PATCH] InflaterInputStream.java (read(byte[],int,int)): return -1 when fill() has no more data for the Inflater. * java/util/zip/InflaterInputStream.java (read(byte[],int,int)): return -1 when fill() has no more data for the Inflater. From-SVN: r35963 --- libjava/ChangeLog | 5 +++++ libjava/java/util/zip/InflaterInputStream.java | 2 ++ 2 files changed, 7 insertions(+) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4fe67e2a9c1..2a525d1dcc1 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2000-08-23 Mark Wielaard + + * 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 * java/io/PrintWriter.java (print(String)): Don't catch IOException, 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 -- 2.30.2