[jboss-cvs] JBossAS SVN: r91114 - projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2009-07-10 14:52:14 -0400 (Fri, 10 Jul 2009)
New Revision: 91114

Modified:
   projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/ExtractUtil.java
Log:
[JBJCA-111] SJC: Temporary files must be deleted before deployment

Modified: projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/ExtractUtil.java
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/ExtractUtil.java	2009-07-10 18:51:02 UTC (rev 91113)
+++ projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/ExtractUtil.java	2009-07-10 18:52:14 UTC (rev 91114)
@@ -68,7 +68,7 @@
       File target = new File(directory, file.getName());
 
       if (target.exists())
-         target.delete();
+         recursiveDelete(target);
 
       target.mkdirs();
 
@@ -106,4 +106,31 @@
 
       return target;
    }
+
+   /**
+    * Recursive delete
+    * @param f The file handler
+    */
+   public static void recursiveDelete(File f)
+   {
+      if (f.exists())
+      {
+         File[] files = f.listFiles();
+         if (files != null)
+         {
+            for (int i = 0; i < files.length; i++)
+            {
+               if (files[i].isDirectory())
+               {
+                  recursiveDelete(files[i]);
+               } 
+               else
+               {
+                  files[i].delete();
+               }
+            }
+         }
+         f.delete();
+      }
+   }
 }