InflaterInputStream.java (read): Throw ZipException if inflater throws a DataFormatEx...

	* java/util/zip/InflaterInputStream.java (read): Throw
	ZipException if inflater throws a DataFormatException.

From-SVN: r27719

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1581108..9bd1842 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+1999-06-23  Tom Tromey  <tromey@cygnus.com>
+
+       * java/util/zip/InflaterInputStream.java (read): Throw
+       ZipException if inflater throws a DataFormatException.
+
 1999-06-23  Warren Levy  <warrenl@cygnus.com>
 
        * java/net/DatagramSocketImpl.java (localPort): Fixed typo to match JDK.

diff --git a/libjava/java/util/zip/InflaterInputStream.java b/libjava/java/util/zip/InflaterInputStream.java
index 7ee4455..7471247 100644 (file)
--- a/libjava/java/util/zip/InflaterInputStream.java
+++ b/libjava/java/util/zip/InflaterInputStream.java
@@ -67,7 +67,14 @@ public class InflaterInputStream extends FilterInputStream
       fill ();
     if (inf.needsDictionary())
       return -1;
-    return inf.inflate(buf, off, len);
+    try
+      {
+       return inf.inflate(buf, off, len);
+      }
+    catch (DataFormatException dfe)
+      {
+       throw new ZipException (dfe.getMessage());
+      }
   }
 
   public long skip (long n) throws IOException