From f2e541ce26c87f29e2a2798b85674725a6aa094a Mon Sep 17 00:00:00 2001 From: Anthony Green Date: Sun, 20 Aug 2000 17:49:12 +0000 Subject: URLClassLoader.java: Find the JarEntry via the JarFile. Sun Aug 20 09:51:48 2000 Anthony Green * java/net/URLClassLoader.java: Find the JarEntry via the JarFile. * java/net/JarURLConnection.java: getEntry doesn't take any arguments. Return null if element is null. * java/util/zip/ZipFile.java (getInputStream): Read the compressed size from the archive, not the inflated size. * java/util/jar/JarFile.java (getEntry): Don't recurse. Call java.util.zip.ZipFile.getEntry. * gij.cc (help): Change sourceware reference to sources.redhat.com. From-SVN: r35821 --- libjava/java/util/jar/JarFile.java | 2 +- libjava/java/util/zip/ZipFile.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'libjava/java/util') diff --git a/libjava/java/util/jar/JarFile.java b/libjava/java/util/jar/JarFile.java index 3f1823a..bcf7dd8 100644 --- a/libjava/java/util/jar/JarFile.java +++ b/libjava/java/util/jar/JarFile.java @@ -232,7 +232,7 @@ public class JarFile extends ZipFile { public ZipEntry getEntry(String name) { ZipEntry entry = super.getEntry(name); if (entry != null) { - JarEntry jarEntry = new JarEntry(getEntry(name)); + JarEntry jarEntry = new JarEntry(super.getEntry(name)); if (manifest != null) { jarEntry.attr = manifest.getAttributes(name); // XXX jarEntry.certs diff --git a/libjava/java/util/zip/ZipFile.java b/libjava/java/util/zip/ZipFile.java index 7825786..22ed74b 100644 --- a/libjava/java/util/zip/ZipFile.java +++ b/libjava/java/util/zip/ZipFile.java @@ -121,7 +121,7 @@ public class ZipFile implements ZipConstants public InputStream getInputStream(ZipEntry ze) throws IOException { - byte[] buffer = new byte[(int) ze.getSize()]; + byte[] buffer = new byte[(int) ze.getCompressedSize()]; /* Read the size of the extra field, and skip to the start of the data. */ -- cgit v1.1