Author: ritchiem
Date: Mon Mar 2 15:12:47 2009
New Revision: 749330
URL: http://svn.apache.org/viewvc?rev=749330&view=rev
Log:
Added check for when file reference becomes null, occurs if the file is
externally deleted. Also noted success return value was never propogated
correctly, Updated : Test needed.
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=749330&r1=749329&r2=749330&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
Mon Mar 2 15:12:47 2009
@@ -250,12 +250,17 @@
{
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;
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
