summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/common/src/main/java/org/apache/qpid/util/FileUtils.java11
1 files changed, 8 insertions, 3 deletions
diff --git a/java/common/src/main/java/org/apache/qpid/util/FileUtils.java b/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
index 3e13259ee3..3d43b9d511 100644
--- a/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
+++ b/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
@@ -250,12 +250,17 @@ public class FileUtils
{
if (recursive)
{
- for (File subFile : file.listFiles())
+ try{
+ for (File subFile : file.listFiles())
+ {
+ success = delete(subFile, true) & success ;
+ }
+ }catch (NullPointerException npe)
{
- success = delete(subFile, true) & success ;
+ success = false;
}
- return file.delete();
+ return success && file.delete();
}
return false;