diff options
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java b/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java index 3d43b9d511..585657c8bb 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java @@ -246,18 +246,19 @@ public class FileUtils { boolean success = true; + // If we have nothing to delete then it must be ok to say it was deleted. + if (file == null) + { + return true; + } + if (file.isDirectory()) { if (recursive) { - try{ - for (File subFile : file.listFiles()) - { - success = delete(subFile, true) & success ; - } - }catch (NullPointerException npe) + for (File subFile : file.listFiles()) { - success = false; + success = delete(subFile, true) & success ; } return success && file.delete(); |