[jboss-cvs] JBossAS SVN: r92401 - in projects/vfs/branches/Branch_2_1/src: test/java/org/jboss/test/virtual/test and 1 other directory.

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

Author: alesj
Date: 2009-08-15 08:51:02 -0400 (Sat, 15 Aug 2009)
New Revision: 92401

Modified:
   projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java
   projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryHandler.java
   projects/vfs/branches/Branch_2_1/src/test/java/org/jboss/test/virtual/test/VFSAllTestSuite.java
Log:
Add potential missing code - usage of releaseHandles

Modified: projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java
===================================================================
--- projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java	2009-08-15 09:13:30 UTC (rev 92400)
+++ projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java	2009-08-15 12:51:02 UTC (rev 92401)
@@ -887,11 +887,13 @@
 
    /**
     * Temporarily release file handles if possible
+    *
+    * @param handler the handler to release
     */
    void releaseHandles(ZipEntryHandler handler)
    {
       VirtualFileHandler rootHandler = getRoot();
-      if (rootHandler.equals(handler) && zipSource != null)
+      if (zipSource != null && rootHandler.equals(handler))
       {
          zipSource.releaseHandles();
       }

Modified: projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryHandler.java
===================================================================
--- projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryHandler.java	2009-08-15 09:13:30 UTC (rev 92400)
+++ projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryHandler.java	2009-08-15 12:51:02 UTC (rev 92401)
@@ -176,6 +176,12 @@
       getZipEntryContext().cleanup(this);
    }
 
+   @Override
+   public void releaseHandles()
+   {
+      getZipEntryContext().releaseHandles(this);
+   }
+
    public boolean delete(int gracePeriod) throws IOException
    {
       checkClosed();

Modified: projects/vfs/branches/Branch_2_1/src/test/java/org/jboss/test/virtual/test/VFSAllTestSuite.java
===================================================================
--- projects/vfs/branches/Branch_2_1/src/test/java/org/jboss/test/virtual/test/VFSAllTestSuite.java	2009-08-15 09:13:30 UTC (rev 92400)
+++ projects/vfs/branches/Branch_2_1/src/test/java/org/jboss/test/virtual/test/VFSAllTestSuite.java	2009-08-15 12:51:02 UTC (rev 92401)
@@ -102,6 +102,7 @@
       suite.addTest(TempCleanupUnitTestCase.suite());
       suite.addTest(ExplodeCleanupUnitTestCase.suite());
       suite.addTest(UnjarCleanupUnitTestCase.suite());
+      suite.addTest(ZipReleaseAfterCopyTestCase.suite());
 
       return suite;
    }