From 2c59a0059f59b2fda27c9b5c727de2ed156d65b6 Mon Sep 17 00:00:00 2001
From: Frank Wennerdahl <frank.wennerdahl@arcadelia.com>
Date: Thu, 24 Jan 2013 09:59:09 +0100
Subject: [PATCH] Fixed removal of upload temp files

Fixed an issue with an unclosed stream preventing upload temp files from
being removed after use. Also removed the use of FileCleaningTracker and
instead added manual removal of all tempfiles. By doing this the reaper
threads in FileCleaningTracker are avoided and files are removed
directly after use.
---
 .../google/refine/importing/ImportingUtilities.java | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/main/src/com/google/refine/importing/ImportingUtilities.java b/main/src/com/google/refine/importing/ImportingUtilities.java
index d908249b0..703023a16 100644
--- a/main/src/com/google/refine/importing/ImportingUtilities.java
+++ b/main/src/com/google/refine/importing/ImportingUtilities.java
@@ -65,7 +65,6 @@ import org.apache.commons.fileupload.ProgressListener;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.fileupload.util.Streams;
-import org.apache.commons.io.FileCleaningTracker;
 import org.apache.tools.bzip2.CBZip2InputStream;
 import org.apache.tools.tar.TarEntry;
 import org.apache.tools.tar.TarInputStream;
@@ -187,7 +186,6 @@ public class ImportingUtilities {
         };
         
         DiskFileItemFactory fileItemFactory = new DiskFileItemFactory();
-        fileItemFactory.setFileCleaningTracker(new FileCleaningTracker());
         
         ServletFileUpload upload = new ServletFileUpload(fileItemFactory);
         upload.setProgressListener(new ProgressListener() {
@@ -212,8 +210,10 @@ public class ImportingUtilities {
             }
         });
 
+        List tempFiles = upload.parseRequest(request);
+        
         progress.setProgress("Uploading data ...", -1);
-        parts: for (Object obj : upload.parseRequest(request)) {
+        parts: for (Object obj : tempFiles) {
             if (progress.isCanceled()) {
                 break;
             }
@@ -355,6 +355,13 @@ public class ImportingUtilities {
                     uploadCount++;
                 }
             }
+            
+            stream.close();
+        }
+        
+        // Delete all temp files.
+        for (Object obj : tempFiles) {
+            ((FileItem)obj).delete();
         }
         
         JSONUtilities.safePut(retrievalRecord, "uploadCount", uploadCount);