Author: ritchiem
Date: Mon Mar 9 09:40:13 2009
New Revision: 751636
URL: http://svn.apache.org/viewvc?rev=751636&view=rev
Log:
FileUtils would report a failure to delete a non-existent file
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/util/FileUtilsTest.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=751636&r1=751635&r2=751636&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 9 09:40:13 2009
@@ -247,7 +247,7 @@
boolean success = true;
// If we have nothing to delete then it must be ok to say it was
deleted.
- if (file == null)
+ if (file == null || !file.exists())
{
return true;
}
@@ -258,7 +258,7 @@
{
for (File subFile : file.listFiles())
{
- success = delete(subFile, true) & success ;
+ success = delete(subFile, true) && success;
}
return success && file.delete();
Modified:
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/util/FileUtilsTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/util/FileUtilsTest.java?rev=751636&r1=751635&r2=751636&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/util/FileUtilsTest.java
(original)
+++
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/util/FileUtilsTest.java
Mon Mar 9 09:40:13 2009
@@ -280,6 +280,16 @@
checkFileLists(filesBefore, filesAfter);
}
+ public void testDeleteNonExistentFile()
+ {
+ File test = new
File("FileUtilsTest-testDelete-"+System.currentTimeMillis());
+
+ assertTrue("File exists", !test.exists());
+ assertFalse("File is a directory", test.isDirectory());
+
+ assertTrue("Unable to delete",FileUtils.delete(test,true));
+ }
+
/**
* Given two lists of File arrays ensure they are the same length and all
entries in Before are in After
*
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
