From da54f9769b75b902494e90bc9bfb07aeb4aab086 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Fri, 6 Apr 2012 14:54:48 -0400 Subject: [PATCH] Stop giving up immediately on the first failed file deletion and continue deleting files recursively. --- .../com/onarandombox/MultiverseCore/utils/FileUtils.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/FileUtils.java b/src/main/java/com/onarandombox/MultiverseCore/utils/FileUtils.java index 9d40b11d..5047d845 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/FileUtils.java +++ b/src/main/java/com/onarandombox/MultiverseCore/utils/FileUtils.java @@ -25,19 +25,16 @@ public class FileUtils { */ public static boolean deleteFolder(File file) { if (file.exists()) { + boolean ret = true; // If the file exists, and it has more than one file in it. if (file.isDirectory()) { for (File f : file.listFiles()) { - if (!FileUtils.deleteFolder(f)) { - return false; - } + ret = ret && deleteFolder(f); } } - file.delete(); - return !file.exists(); + return ret && file.delete(); } else { return false; } } - }