Packed resources are unnecessarily cached after unpacking

see: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3715
lherschi · Apr 2, 2019 · 8b56714 · 8b56714
1 parent 1be0a12
commit 8b56714
Showing 1 changed file with 26 additions and 12 deletions.
diff --git a/netx/net/sourceforge/jnlp/cache/ResourceDownloader.java b/netx/net/sourceforge/jnlp/cache/ResourceDownloader.java
@@ -357,11 +357,11 @@ private void downloadResource() {
             // return ".gz", so if we check gzip first, we would end up
             // treating a pack200 file as a jar file.
             if (packgz) {
-                downloadPackGzFile(resource, connection, new URL(downloadFrom + ".pack.gz"), downloadTo);
+                downloadPackGzFile(connection, new URL(downloadFrom + ".pack.gz"), downloadTo);
             } else if (gzip) {
-                downloadGZipFile(resource, connection, new URL(downloadFrom + ".gz"), downloadTo);
+                downloadGZipFile(connection, new URL(downloadFrom + ".gz"), downloadTo);
             } else {
-                downloadFile(resource, connection, downloadTo);
+                downloadFile(connection, downloadTo);
             }
 
             resource.changeStatus(EnumSet.of(DOWNLOADING), EnumSet.of(DOWNLOADED));
@@ -390,26 +390,28 @@ private URLConnection getDownloadConnection(URL location) throws IOException {
         return con;
     }
 
-    private void downloadPackGzFile(Resource resource, URLConnection connection, URL downloadFrom, URL downloadTo) throws IOException {
-        downloadFile(resource, connection, downloadFrom);
+    private void downloadPackGzFile(URLConnection connection, URL downloadFrom, URL downloadTo) throws IOException {
+        downloadFile(connection, downloadFrom);
 
         uncompressPackGz(downloadFrom, downloadTo, resource.getDownloadVersion());
         storeEntryFields(new CacheEntry(downloadTo, resource.getDownloadVersion()), connection.getContentLength(), connection.getLastModified());
+        markForDelete(downloadFrom);
     }
 
-    private void downloadGZipFile(Resource resource, URLConnection connection, URL downloadFrom, URL downloadTo) throws IOException {
-        downloadFile(resource, connection, downloadFrom);
+    private void downloadGZipFile(URLConnection connection, URL downloadFrom, URL downloadTo) throws IOException {
+        downloadFile(connection, downloadFrom);
 
         uncompressGzip(downloadFrom, downloadTo, resource.getDownloadVersion());
         storeEntryFields(new CacheEntry(downloadTo, resource.getDownloadVersion()), connection.getContentLength(), connection.getLastModified());
+        markForDelete(downloadFrom);
     }
 
-    private void downloadFile(Resource resource, URLConnection connection, URL downloadLocation) throws IOException {
+    private void downloadFile(URLConnection connection, URL downloadLocation) throws IOException {
         CacheEntry downloadEntry = new CacheEntry(downloadLocation, resource.getDownloadVersion());
         OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "Downloading file: " + downloadLocation + " into: " + downloadEntry.getCacheFile().getCanonicalPath());
         if (!downloadEntry.isCurrent(connection.getLastModified())) {
             try {
-                writeDownloadToFile(resource, downloadLocation, new BufferedInputStream(connection.getInputStream()));
+                writeDownloadToFile(downloadLocation, new BufferedInputStream(connection.getInputStream()));
             } catch (IOException ex) {
                 String IH = "Invalid Http response";
                 if (ex.getMessage().equals(IH)) {
@@ -421,7 +423,7 @@ private void downloadFile(Resource resource, URLConnection connection, URL downl
                     byte[] body = (byte[]) result[1];
                     OutputController.getLogger().log(head);
                     OutputController.getLogger().log("Body is: " + body.length + " bytes long");
-                    writeDownloadToFile(resource, downloadLocation, new ByteArrayInputStream(body));
+                    writeDownloadToFile(downloadLocation, new ByteArrayInputStream(body));
                 } else {
                     throw ex;
                 }
@@ -443,8 +445,20 @@ private void storeEntryFields(CacheEntry entry, long contentLength, long lastMod
             entry.unlock();
         }
     }
-
-    private void writeDownloadToFile(Resource resource, URL downloadLocation, InputStream in) throws IOException {
+
+    private void markForDelete(URL location) {
+        CacheEntry entry = new CacheEntry(location, 
+                                          resource.getDownloadVersion());
+        entry.lock();
+        try {
+            entry.markForDelete();
+            entry.store();
+        } finally {
+            entry.unlock();
+        }
+    }
+
+    private void writeDownloadToFile(URL downloadLocation, InputStream in) throws IOException {
         byte buf[] = new byte[1024];
         int rlen;
         try (OutputStream out = CacheUtil.getOutputStream(downloadLocation, resource.getDownloadVersion())) {