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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7f37ba2f65997af900828bb4230b520bf110ae4f..522fdeebe17dfb9a5b43875616b6eb37c0825d4a 100644 (file)
--- 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 bcf7dd89b2e8d1356f7ecba00ef8cecfe190abf5..a266f305bac62848cb47092e83e412a698e160fa 100644 (file)
--- 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