diff options
| author | green <green@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-08-20 17:49:12 +0000 |
|---|---|---|
| committer | green <green@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-08-20 17:49:12 +0000 |
| commit | 57b0b1025d6ee33cfb8c6a7d18153e12f35063b5 (patch) | |
| tree | a667239f51829ad45d70131f03d739cc10cb341b /libjava/java/util | |
| parent | 819726c29fff3824967402e769133d2865ea8721 (diff) | |
| download | ppe42-gcc-57b0b1025d6ee33cfb8c6a7d18153e12f35063b5.tar.gz ppe42-gcc-57b0b1025d6ee33cfb8c6a7d18153e12f35063b5.zip | |
Sun Aug 20 09:51:48 2000 Anthony Green <green@redhat.com>
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35821 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/util')
| -rw-r--r-- | libjava/java/util/jar/JarFile.java | 2 | ||||
| -rw-r--r-- | libjava/java/util/zip/ZipFile.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libjava/java/util/jar/JarFile.java b/libjava/java/util/jar/JarFile.java index 3f1823a00b4..bcf7dd89b2e 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 78257869fe9..22ed74b6e78 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. */ |
