Changeset 6514

Timestamp:

Aug 13, 2014, 2:22:46 PM (7 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1831: Packed file exporter doesn't close stream after an exception

File:

• branches/3.3-stable/src/plugins/core/net/sf/basedb/plugins/PackedFileExporter.java (modified) (2 diffs)

branches/3.3-stable/src/plugins/core/net/sf/basedb/plugins/PackedFileExporter.java

@@ -56 +56 @@
 import net.sf.basedb.core.signal.SignalTarget;
 import net.sf.basedb.core.signal.ThreadSignalHandler;
+import net.sf.basedb.util.FileUtil;
 import net.sf.basedb.util.Values;
 import net.sf.basedb.util.zip.FilePacker;
@@ -385 +386 @@
       long size = 0;
       InputStream in = null;
-      if (item.getType() == Item.FILE)
-      {
-        File f = (File)item;
-        entryPath = f.getPath().toString();
-        lastModified = f.getLastUpdate();
-        in = f.getDownloadStream(0);
-        size = f.getSize();
-        if (removeItems && f.hasPermission(Permission.DELETE)) f.setRemoved(true);
-      }
-      else
-      {
-        Directory d = (Directory)item;
-        entryPath = d.getPath().toString();
-        if (removeItems && d.hasPermission(Permission.DELETE)) d.setRemoved(true);
-      }
-      
-      // Remove rootPath from entryPath
-      entryPath = entryPath.substring(rootPath.length());
-      
-      // Update progress
-      if (progress != null)
-      {
-        int percent = (int)(completedBytes * progressFactor);
-        progress.display(percent, "Compressing '" + entryPath + "'; " + 
-          currentFile + " of " + numFiles + " file(s) (" +
-          Values.formatBytes(completedBytes) + " of " + Values.formatBytes(totalBytes) + ")");
-      }
-
-      // Send to FilePacker
-      packer.pack(entryPath, in, size, lastModified == null ? 0 : lastModified.getTime());
-      if (in != null) in.close();
-      completedBytes += size;
+      try
+      {
+        if (item.getType() == Item.FILE)
+        {
+          File f = (File)item;
+          entryPath = f.getPath().toString();
+          lastModified = f.getLastUpdate();
+          in = f.getDownloadStream(0);
+          size = f.getSize();
+          if (removeItems && f.hasPermission(Permission.DELETE)) f.setRemoved(true);
+        }
+        else
+        {
+          Directory d = (Directory)item;
+          entryPath = d.getPath().toString();
+          if (removeItems && d.hasPermission(Permission.DELETE)) d.setRemoved(true);
+        }
+        
+        // Remove rootPath from entryPath
+        entryPath = entryPath.substring(rootPath.length());
+        
+        // Update progress
+        if (progress != null)
+        {
+          int percent = (int)(completedBytes * progressFactor);
+          progress.display(percent, "Compressing '" + entryPath + "'; " + 
+            currentFile + " of " + numFiles + " file(s) (" +
+            Values.formatBytes(completedBytes) + " of " + Values.formatBytes(totalBytes) + ")");
+        }
+  
+        // Send to FilePacker
+        packer.pack(entryPath, in, size, lastModified == null ? 0 : lastModified.getTime());
+        completedBytes += size;
+      }
+      finally
+      {
+        FileUtil.close(in);
+      }
     }