You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2009/04/11 00:09:16 UTC
svn commit: r764076 -
/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
Author: ritchiem
Date: Fri Apr 10 22:09:15 2009
New Revision: 764076
URL: http://svn.apache.org/viewvc?rev=764076&view=rev
Log:
QPID-1803 : Fixed potential NPE in FileUtils.delete
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java?rev=764076&r1=764075&r2=764076&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java Fri Apr 10 22:09:15 2009
@@ -250,9 +250,17 @@
{
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();
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org