InflaterInputStream.java (read): Return zero when len is zero.

       * java/util/zip/InflaterInputStream.java (read): Return zero when len
       is zero.

From-SVN: r62872

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d6f977f8dd905431559f1d364710b67786edfc09..cf20ae01d23312a68c3ca0578636bdc8612e7ca2 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-13  Mark Wielaard  <mark@klomp.org>
+ 
+       * java/util/zip/InflaterInputStream.java (read): Return zero when len
+       is zero.
+
 2003-02-13  Mark Wielaard  <mark@klomp.org>
 
        * java/io/BufferedOutputStream.java (write(int)): Only flush when

diff --git a/libjava/java/util/zip/InflaterInputStream.java b/libjava/java/util/zip/InflaterInputStream.java
index 5aac73d7e5ab4acc6d5cc4e17a954d313e06e644..b04534977f1f8e12e0b07e6fb3fc19a3b495fccc 100644 (file)
--- a/libjava/java/util/zip/InflaterInputStream.java
+++ b/libjava/java/util/zip/InflaterInputStream.java
@@ -1,5 +1,5 @@
 /* InflaterInputStream.java - Input stream filter for decompressing
-   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -90,6 +90,8 @@ public class InflaterInputStream extends FilterInputStream
   {
     if (inf == null)
       throw new IOException ("stream closed");
+    if (len == 0)
+      return 0;
     if (inf.finished())
       return -1;