diff options
| author | Anthony Green <green@redhat.com> | 2000-08-20 19:40:25 +0000 |
|---|---|---|
| committer | Anthony Green <green@gcc.gnu.org> | 2000-08-20 19:40:25 +0000 |
| commit | 53e687fabb8208f715fd30172c48430eef4e2255 (patch) | |
| tree | a2544594a1be4dfd614ed76364fdef425138e441 | |
| parent | 9c668921875d761127f477b263655ed774671ff0 (diff) | |
| download | gcc-53e687fabb8208f715fd30172c48430eef4e2255.zip gcc-53e687fabb8208f715fd30172c48430eef4e2255.tar.gz gcc-53e687fabb8208f715fd30172c48430eef4e2255.tar.bz2 | |
JarFile.java: Don't call java.util.zip.ZipFile.getEntry twice.
* java/util/jar/JarFile.java: Don't call
java.util.zip.ZipFile.getEntry twice. From Mark Wielaard
<mark@klomp.org>.
From-SVN: r35824
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/util/jar/JarFile.java | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 7f37ba2..522fdee 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +Sun Aug 20 12:33:43 2000 Anthony Green <green@redhat.com> + + * java/util/jar/JarFile.java: Don't call + java.util.zip.ZipFile.getEntry twice. From Mark Wielaard + <mark@klomp.org>. + Sun Aug 20 09:51:48 2000 Anthony Green <green@redhat.com> * java/net/URLClassLoader.java: Find the JarEntry via the JarFile. diff --git a/libjava/java/util/jar/JarFile.java b/libjava/java/util/jar/JarFile.java index bcf7dd8..a266f30 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(super.getEntry(name)); + JarEntry jarEntry = new JarEntry(entry); if (manifest != null) { jarEntry.attr = manifest.getAttributes(name); // XXX jarEntry.certs |