From 8559f9bb2f3d3bb300d21df3ad41901dc6619121 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Sun, 20 Aug 2000 21:51:19 +0000 Subject: Adler32.java: Make private variables really private 2000-08-20 Mark Wielaard * java/util/zip/Adler32.java: Make private variables really private * java/util/zip/CRC32.java: Make private variables really private * java/util/zip/CheckedInputStream.java: skip() could skip to much bytes * java/util/zip/InflaterInputStream.java: skip() could skip to much bytes * java/util/zip/ZipEntry.java: setCompressedSize() didn't check input * java/util/zip/ZipFile.java: size() new 1.2 method * java/util/zip/ZipInputStream.java: Use createZipEntry not new ZipEntry. since 1.2 available() always returns just 1 or 0 when closed From-SVN: r35826 --- libjava/java/util/zip/ZipInputStream.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'libjava/java/util/zip/ZipInputStream.java') diff --git a/libjava/java/util/zip/ZipInputStream.java b/libjava/java/util/zip/ZipInputStream.java index a147b228a69..79efb59f06c 100644 --- a/libjava/java/util/zip/ZipInputStream.java +++ b/libjava/java/util/zip/ZipInputStream.java @@ -89,7 +89,7 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants int extraLength = readu2(); byte[] bname = new byte[filenameLength]; readFully(bname); - ZipEntry entry = new ZipEntry(new String(bname, "8859_1")); + ZipEntry entry = createZipEntry(new String(bname, "8859_1")); if (extraLength > 0) { byte[] bextra = new byte[extraLength]; @@ -160,6 +160,13 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants return count; } + public int available() { + if (closed) + return 0; + else + return 1; + } + private void readFully (byte[] b) throws IOException { int off = 0; @@ -222,6 +229,7 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants public void close () throws IOException { current = null; + closed = true; super.close(); } @@ -231,4 +239,6 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants private int avail; // Number of bytes we can read from underlying stream. private int compressed_bytes; + // Is this ZipInputStream closed? Set by the close() method. + private boolean closed = false; } -- cgit v1.2.3