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

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

Author: alesj
Date: 2009-01-12 12:07:38 -0500 (Mon, 12 Jan 2009)
New Revision: 82782

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DelegatingHandler.java
   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/zip/ZipEntryContext.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryHandler.java
Log:
Initial [JBVFS-85] impl.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DelegatingHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DelegatingHandler.java	2009-01-12 16:54:24 UTC (rev 82781)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DelegatingHandler.java	2009-01-12 17:07:38 UTC (rev 82782)
@@ -150,6 +150,12 @@
       return getDelegate().isNested();
    }
 
+   @Override
+   public void close()
+   {
+      getDelegate().close();
+   }
+
    public boolean delete(int gracePeriod) throws IOException
    {
       return getDelegate().delete(gracePeriod);

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-12 16:54:24 UTC (rev 82781)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/FileHandler.java	2009-01-12 17:07:38 UTC (rev 82782)
@@ -235,6 +235,7 @@
             // if underlying file has been modified then create a new handler instead of using the cached one
             if (handler != null && handler.hasBeenModified())
             {
+               handler.close(); // close old cached one
                handler = null;
             }
             if (handler == null)

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java	2009-01-12 16:54:24 UTC (rev 82781)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java	2009-01-12 17:07:38 UTC (rev 82782)
@@ -792,6 +792,20 @@
    }
 
    /**
+    * Close the handler, if it's root.
+    *
+    * @param handler the handler to close
+    */
+   public void close(ZipEntryHandler handler)
+   {
+      VirtualFileHandler rootHandler = getRoot();
+      if (rootHandler.equals(handler))
+      {
+         getZipSource().close();
+      }
+   }
+
+   /**
     * Returns lastModified timestamp for a given handler
     *
     * @param handler a handler

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryHandler.java	2009-01-12 16:54:24 UTC (rev 82781)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryHandler.java	2009-01-12 17:07:38 UTC (rev 82782)
@@ -160,6 +160,12 @@
       return false;
    }
 
+   @Override
+   protected void doClose()
+   {
+      getZipEntryContext().close(this);
+   }
+
    public boolean delete(int gracePeriod) throws IOException
    {
       checkClosed();