summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/java/util/jar/JarFile.java2
2 files changed, 7 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7f37ba2f659..522fdeebe17 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 bcf7dd89b2e..a266f305bac 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