From 139bf0ee3534838de9111c34a463232bddde4d14 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Fri, 28 Mar 2014 05:21:16 -0400 Subject: [PATCH] updated delete file method Former-commit-id: d5821f9476d9b230633eb0feac20d72f60baf337 --- .../java/org/owasp/dependencycheck/utils/FileUtils.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java index bda2a82c7..d7804986e 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java @@ -84,15 +84,11 @@ public final class FileUtils { */ public static boolean delete(File file) { boolean success = true; - if (file.isDirectory()) { //some of this may duplicative of deleteQuietly.... - for (File f : file.listFiles()) { - success &= delete(f); - } - } if (!org.apache.commons.io.FileUtils.deleteQuietly(file)) { success = false; - final String msg = String.format("Failed to delete file: %s", file.getPath()); + final String msg = String.format("Failed to delete file: %s; attempting to delete on exit.", file.getPath()); Logger.getLogger(FileUtils.class.getName()).log(Level.FINE, msg); + file.deleteOnExit(); } return success; } @@ -252,6 +248,7 @@ public final class FileUtils { /** * Return the bit bucket for the OS. '/dev/null' for Unix and 'NUL' for Windows + * * @return a String containing the bit bucket */ public static String getBitBucket() {