[jboss-cvs] JBossAS SVN: r91935 - projects/vfs/branches/dml-zip-rework/src/main/java/org/jboss/virtual.

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

Author: david.lloyd at jboss.com
Date: 2009-08-03 22:15:47 -0400 (Mon, 03 Aug 2009)
New Revision: 91935

Modified:
   projects/vfs/branches/dml-zip-rework/src/main/java/org/jboss/virtual/TempFileProvider.java
   projects/vfs/branches/dml-zip-rework/src/main/java/org/jboss/virtual/VFSUtils.java
Log:
Make recursiveDelete public

Modified: projects/vfs/branches/dml-zip-rework/src/main/java/org/jboss/virtual/TempFileProvider.java
===================================================================
--- projects/vfs/branches/dml-zip-rework/src/main/java/org/jboss/virtual/TempFileProvider.java	2009-08-04 02:14:45 UTC (rev 91934)
+++ projects/vfs/branches/dml-zip-rework/src/main/java/org/jboss/virtual/TempFileProvider.java	2009-08-04 02:15:47 UTC (rev 91935)
@@ -132,21 +132,6 @@
       VFSUtils.safeClose(this);
    }
 
-   private static boolean recursiveDelete(File root) {
-      boolean ok = true;
-      if (root.isDirectory()) {
-         final File[] files = root.listFiles();
-         for (File file : files)
-         {
-            ok &= recursiveDelete(file);
-         }
-         return ok && (root.delete() || ! root.exists());
-      } else {
-         ok &= root.delete() || ! root.exists();
-      }
-      return ok;
-   }
-
    class DeleteTask implements Runnable
    {
       private final File root;
@@ -158,7 +143,7 @@
 
       public void run()
       {
-         if (! recursiveDelete(root)) {
+         if (! VFSUtils.recursiveDelete(root)) {
             executor.schedule(this, 30L, TimeUnit.SECONDS);
          }
       }

Modified: projects/vfs/branches/dml-zip-rework/src/main/java/org/jboss/virtual/VFSUtils.java
===================================================================
--- projects/vfs/branches/dml-zip-rework/src/main/java/org/jboss/virtual/VFSUtils.java	2009-08-04 02:14:45 UTC (rev 91934)
+++ projects/vfs/branches/dml-zip-rework/src/main/java/org/jboss/virtual/VFSUtils.java	2009-08-04 02:15:47 UTC (rev 91935)
@@ -550,4 +550,19 @@
          log.trace("Failed to close resource", e);
       }
    }
+
+   public static boolean recursiveDelete(File root) {
+      boolean ok = true;
+      if (root.isDirectory()) {
+         final File[] files = root.listFiles();
+         for (File file : files)
+         {
+            ok &= recursiveDelete(file);
+         }
+         return ok && (root.delete() || ! root.exists());
+      } else {
+         ok &= root.delete() || ! root.exists();
+      }
+      return ok;
+   }
 }