QPID-1803 : Fixed potential NPE in FileUtils.delete

merged from trunk r764076



git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@764116 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 10 insertions, 2 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 e4bfb9c664..63222b50db 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
@@ -250,9 +250,17 @@ public class FileUtils
          {
              if (recursive)
              {
-                 for (File subFile : file.listFiles())
+                 File[] files = file.listFiles();
+
+                 // This can occur if the file is deleted outside the JVM
+                 if (files == null)
+                 {
+                     return false;
+                 }
+
+                 for (int i = 0; i < files.length; i++)
                  {
-                     success = delete(subFile, true) && success;
+                     success = delete(files[i], true) && success;
                  }
 
                  return success && file.delete();