s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed removal of upload temp files

Browse Source 
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.
This commit is contained in:
Frank Wennerdahl 2013-01-24 09:59:09 +01:00
parent f1387bdb24
commit 2c59a0059f
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main/src/com/google/refine/importing/ImportingUtilities.java
View File

@ -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);