svn commit: r1331609 - /oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/action/DeleteFile.java

[lu...@apache.org]

Author: luca
Date: Fri Apr 27 21:45:00 2012
New Revision: 1331609

URL: http://svn.apache.org/viewvc?rev=1331609&view=rev
Log:
OODT-450

Modified:
    oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/action/DeleteFile.java

Modified: oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/action/DeleteFile.java
URL: http://svn.apache.org/viewvc/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/action/DeleteFile.java?rev=1331609&r1=1331608&r2=1331609&view=diff
==============================================================================
--- oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/action/DeleteFile.java (original)
+++ oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/action/DeleteFile.java Fri Apr 27 21:45:00 2012
@@ -21,6 +21,7 @@ import java.io.File;
 import java.util.logging.Level;
 
 //Apache imports
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.Validate;
 
 //OODT imports
@@ -32,6 +33,7 @@ import org.apache.oodt.cas.metadata.Meta
  * 
  * @author bfoster (Brian Foster)
  * @author mattmann (Chris Mattmann)
+ * @author luca (Luca Cinquini)
  */
 public class DeleteFile extends CrawlerAction {
 
@@ -50,7 +52,14 @@ public class DeleteFile extends CrawlerA
          }
 
          LOG.log(Level.INFO, "Deleting file " + fileToDelete.getAbsolutePath());
-         return fileToDelete.delete();
+         if (fileToDelete.isDirectory()) {
+         	// the following method will throw an exception if the directory cannot be deleted
+         	FileUtils.deleteDirectory(fileToDelete); 
+         	return true;
+         } else {
+        	 return fileToDelete.delete();
+         }
+         
       } catch (Exception e) {
          LOG.log(Level.SEVERE, "Error while deleting file for product '"
                + product + "' : " + e.getMessage(), e);