From 47e6955aa209020cd6c0d8e3df7eb358cb3e9a32 Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Mon, 11 Apr 2005 11:44:54 +0000
Subject: [PATCH] Don not use potentially deprecated ZipEntry to get an entry's
 size. The entry may have been generated for an old version of the zip file
 and not exist at all. As a fix, don't store the ZipEntry at all in
 ZipResource, just the ZipEntry's name.

---
 .../framework/repository/ZipRepository.java   |  4 +-
 .../framework/repository/ZipResource.java     | 45 ++++++++++++-------
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/helma/framework/repository/ZipRepository.java b/src/helma/framework/repository/ZipRepository.java
index 463435dd..5d568ce5 100644
--- a/src/helma/framework/repository/ZipRepository.java
+++ b/src/helma/framework/repository/ZipRepository.java
@@ -113,7 +113,7 @@ public final class ZipRepository extends AbstractRepository {
                     // path depth of this.depth + 1
                     if (entrypath.length == depth + 1 && !entry.isDirectory()) {
                         // create a new child resource
-                        ZipResource resource = new ZipResource(file, entry, this);
+                        ZipResource resource = new ZipResource(entry.getName(), this);
                         newResources.put(resource.getShortName(), resource);
                     } else if (entrypath.length > depth) {
                         // create a new child repository
@@ -161,7 +161,7 @@ public final class ZipRepository extends AbstractRepository {
      * Called to create a child resource for this repository
      */
     protected Resource createResource(String name) {
-        return new ZipResource(file, new ZipEntry(entryPath + "/" + name), this);
+        return new ZipResource(entryPath + "/" + name, this);
     }
 
     public long getChecksum() {
diff --git a/src/helma/framework/repository/ZipResource.java b/src/helma/framework/repository/ZipResource.java
index b02e321c..34b35fb3 100644
--- a/src/helma/framework/repository/ZipResource.java
+++ b/src/helma/framework/repository/ZipResource.java
@@ -23,22 +23,19 @@ import java.util.zip.ZipFile;
 
 public final class ZipResource implements Resource {
 
-    private ZipEntry zipentry;
-    private File zipfile;
+    private String entryName;
     private ZipRepository repository;
     private String name;
     private String shortName;
     private String baseName;
 
-    protected ZipResource(File zipfile, ZipEntry zipentry, ZipRepository repository) {
-        this.zipentry = zipentry;
-        this.zipfile = zipfile;
+    protected ZipResource(String zipentryName, ZipRepository repository) {
+        this.entryName = zipentryName;
         this.repository = repository;
 
-        String entryname = zipentry.getName();
-        int lastSlash = entryname.lastIndexOf('/');
+        int lastSlash = entryName.lastIndexOf('/');
 
-        shortName = entryname.substring(lastSlash + 1);
+        shortName = entryName.substring(lastSlash + 1);
         name = new StringBuffer(repository.getName()).append('/')
                 .append(shortName).toString();
 
@@ -48,16 +45,20 @@ public final class ZipResource implements Resource {
     }
 
     public long lastModified() {
-        return zipfile.lastModified();
+        return repository.lastModified();
     }
 
     public InputStream getInputStream() throws IOException {
         ZipFile zipfile = null;
         try {
             zipfile = repository.getZipFile();
-            int size = (int) zipentry.getSize();
+            ZipEntry entry = zipfile.getEntry(entryName);
+            if (entry == null) {
+                throw new IOException("Zip resource " + this + " does not exist");
+            }
+            int size = (int) entry.getSize();
             byte[] buf = new byte[size];
-            InputStream in = zipfile.getInputStream(zipentry);
+            InputStream in = zipfile.getInputStream(entry);
             int read = 0;
             while (read < size) {
                 int r = in.read(buf, read, size-read);
@@ -76,7 +77,7 @@ public final class ZipResource implements Resource {
         ZipFile zipfile = null;
         try {
             zipfile = repository.getZipFile();
-            return (zipfile.getEntry(zipentry.getName()) != null);
+            return (zipfile.getEntry(entryName) != null);
         } catch (Exception ex) {
             return false;
         } finally {
@@ -90,8 +91,12 @@ public final class ZipResource implements Resource {
         ZipFile zipfile = null;
         try {
             zipfile = repository.getZipFile();
-            InputStreamReader in = new InputStreamReader(zipfile.getInputStream(zipentry));
-            int size = (int) zipentry.getSize();
+            ZipEntry entry = zipfile.getEntry(entryName);
+            if (entry == null) {
+                throw new IOException("Zip resource " + this + " does not exist");
+            }
+            InputStreamReader in = new InputStreamReader(zipfile.getInputStream(entry));
+            int size = (int) entry.getSize();
             char[] buf = new char[size];
             int read = 0;
             while (read < size) {
@@ -126,7 +131,17 @@ public final class ZipResource implements Resource {
     }
 
     public long getLength() {
-        return zipentry.getSize();
+        ZipFile zipfile = null;
+        try {
+            zipfile = repository.getZipFile();
+            return zipfile.getEntry(entryName).getSize();            
+        } catch (Exception ex) {
+            return 0;
+        } finally {
+            try {
+                zipfile.close();
+            } catch (Exception ex) {}
+        }
     }
 
     public Repository getRepository() {