From 10cc1af6a8b5218abef0cb55f4e6be50b4f042ad Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Fri, 10 Apr 2009 22:09:15 +0000 Subject: QPID-1803 : Fixed potential NPE in FileUtils.delete git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@764076 13f79535-47bb-0310-9956-ffa450edef68 --- .../common/src/main/java/org/apache/qpid/util/FileUtils.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'java/common/src') 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 e4bfb9c664..63222b50db 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,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(); -- cgit v1.2.1