[jboss-cvs] JBossAS SVN: r83456 - in projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context: jar and 1 other directory.

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

Author: alesj
Date: 2009-01-27 05:30:40 -0500 (Tue, 27 Jan 2009)
New Revision: 83456

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/FileHandler.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarHandler.java
Log:
Use existing delete to do cleanup.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/FileHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/FileHandler.java	2009-01-27 09:14:24 UTC (rev 83455)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/FileHandler.java	2009-01-27 10:30:40 UTC (rev 83456)
@@ -165,12 +165,21 @@
    public void cleanup()
    {
       if (isTemporary())
-         Files.delete(file);
+      {
+         try
+         {
+            delete(2000);
+         }
+         catch (Exception ignored)
+         {
+         }
+      }
    }
 
    public boolean delete(int gracePeriod) throws IOException
    {
-      File f = getFile();
+      // we can bypass the checkClosed
+      File f = file;
 
       boolean exists = f.exists();
       if (exists == false)

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarHandler.java	2009-01-27 09:14:24 UTC (rev 83455)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarHandler.java	2009-01-27 10:30:40 UTC (rev 83456)
@@ -32,7 +32,6 @@
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 
-import org.jboss.util.file.Files;
 import org.jboss.virtual.spi.VFSContext;
 import org.jboss.virtual.spi.VirtualFileHandler;
 
@@ -192,8 +191,13 @@
    @Override
    public void cleanup()
    {
-      if (temp != null)
-         Files.delete(temp);
+      try
+      {
+         delete(2000);
+      }
+      catch (Exception ignored)
+      {
+      }
    }
 
    public boolean delete(int gracePeriod) throws IOException