Allow null directories in directory deletion methods.

This commit is contained in:
Winston Li 2015-03-09 22:35:40 +00:00
parent 83db4e6a10
commit 79307923ad

View file

@ -129,22 +129,28 @@ public class Util {
}
public static void deleteDirectory(File directory) {
deleteInDirectory(directory);
directory.delete();
if (directory != null) {
deleteInDirectory(directory);
directory.delete();
}
}
public static void deleteInDirectory(File directory) {
deleteInDirectoryApartFrom(directory);
if (directory != null) {
deleteInDirectoryApartFrom(directory);
}
}
public static void deleteInDirectoryApartFrom(File directory, String... apartFrom) {
Set<String> excluded = new HashSet<String>(Arrays.asList(apartFrom));
for (File file : directory.listFiles()) {
if (!excluded.contains(file.getName())) {
if (file.isDirectory()) {
deleteInDirectory(file);
if (directory != null) {
Set<String> excluded = new HashSet<String>(Arrays.asList(apartFrom));
for (File file : directory.listFiles()) {
if (!excluded.contains(file.getName())) {
if (file.isDirectory()) {
deleteInDirectory(file);
}
file.delete();
}
file.delete();
}
}
}