From 1c02a3d9640482c8e296f4f939381fde52fd9b18 Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Sat, 20 May 2000 23:30:46 +0000 Subject: re GNATS libgcj/226 (implicit __builtin_expect) and GNATS gcj/228 (compressed JAR files) 2000-05-20 Bryce McKinlay Fix for PR libgcj/226: * java/lang/Class.h (_Jv_InitClass): Don't call __builtin_expect, since this is an installed header. Fix for PR libgcj/228: * java/util/zip/ZipFile (getInputStream): Create inflater with nowrapper option. * java/util/zip/natInflater.cc (inflate): Throw zlib's error message with DataFormatException. From-SVN: r34064 --- libjava/java/util/zip/ZipFile.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libjava/java/util/zip/ZipFile.java') diff --git a/libjava/java/util/zip/ZipFile.java b/libjava/java/util/zip/ZipFile.java index 5e01d57923b..78257869fe9 100644 --- a/libjava/java/util/zip/ZipFile.java +++ b/libjava/java/util/zip/ZipFile.java @@ -133,7 +133,9 @@ public class ZipFile implements ZipConstants InputStream is = new ByteArrayInputStream (buffer); if (ze.getMethod() == ZipEntry.DEFLATED) - is = new InflaterInputStream (is); + // Data in zipfile entries does not have a zlib header, so construct + // an Inflater with the `nowrapper' option. + is = new InflaterInputStream (is, new Inflater (true), 512); return is; } -- cgit v1.2.3