Changeset 15425

Timestamp:

10/20/20 06:45:25 (3 years ago)

Author:

Mark Evenson

Message:

Create and use constructor for ZipCache?.ArchiveStream?

File:

• trunk/abcl/src/org/armedbear/lisp/ZipCache.java (modified) (2 diffs)

trunk/abcl/src/org/armedbear/lisp/ZipCache.java

@@ -200 +200 @@
   {
     ZipInputStream source;
+    ZipEntry rootEntry;
+
+    public ArchiveStream(InputStream stream, JarPathname root, ZipEntry rootEntry) {
+      if (!(stream instanceof ZipInputStream)) {
+        this.source = new ZipInputStream(stream);
+      } else {
+        this.source = (ZipInputStream)stream;
+      }
+      this.root = root;
+      this.rootEntry = rootEntry;
+      this.lastModified = rootEntry.getTime(); // FIXME how to re-check time as modified?
+    }  
 
     // TODO wrap in a weak reference to allow JVM to possibly reclaim memory
@@ -436 +448 @@
         return null;
       }
-      ArchiveStream stream = new ArchiveStream();
-      stream.source = new ZipInputStream(inputStream);
-      stream.root = innerArchive;
-      stream.lastModified = entry.getTime();
+      ArchiveStream stream = new ArchiveStream(inputStream, innerArchive, entry);
       result = stream;
       cache.put(innerArchive, result);