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

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

Author: alesj
Date: 2009-04-15 08:16:16 -0400 (Wed, 15 Apr 2009)
New Revision: 87338

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/JarContext.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/temp/BasicTempInfo.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/protocol/vfsjar/Handler.java
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/JarFileURLTestCase.java
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/VFSAllTestSuite.java
Log:
Check if valid before unzip usage.
Simple code fixes to Carlo's code.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/JarContext.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/JarContext.java	2009-04-15 11:59:31 UTC (rev 87337)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/JarContext.java	2009-04-15 12:16:16 UTC (rev 87338)
@@ -124,6 +124,12 @@
       return entryName;
    }
 
+   /**
+    * Extract jar name.
+    *
+    * @param urlStr the url string
+    * @return jar name
+    */
    public static String extractJarName(String urlStr)
    {
       String jarName = urlStr;

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/temp/BasicTempInfo.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/temp/BasicTempInfo.java	2009-04-15 11:59:31 UTC (rev 87337)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/temp/BasicTempInfo.java	2009-04-15 12:16:16 UTC (rev 87338)
@@ -65,9 +65,16 @@
    public void cleanup()
    {
       if (handler != null)
+      {
          handler.cleanup();
+      }
       else if (file != null && file.exists())
+      {
          Files.delete(file);
+      }
+      // release
+      handler = null;
+      file = null;
    }
 
    public VirtualFileHandler getHandler()

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-04-15 11:59:31 UTC (rev 87337)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java	2009-04-15 12:16:16 UTC (rev 87338)
@@ -520,8 +520,10 @@
                   {
                      path = getPath(context, entryName);
                      TempInfo ti = context.getTempInfo(path);
-                     if (ti != null)
+                     if (ti != null && ti.isValid())
+                     {
                         dest = ti.getTempFile();
+                     }
                   }
 
                   boolean createNewTempInfo = (dest == null || dest.exists() == false);

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/protocol/vfsjar/Handler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/protocol/vfsjar/Handler.java	2009-04-15 11:59:31 UTC (rev 87337)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/protocol/vfsjar/Handler.java	2009-04-15 12:16:16 UTC (rev 87338)
@@ -48,6 +48,7 @@
          file = urlString.substring(3);
       else
          file = urlString.substring(3, index + 2);
+      
       String path = urlString.substring(index + 2);
       URL url = new URL(file);
       return new VirtualFileURLConnection(u, url, path);

Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/JarFileURLTestCase.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/JarFileURLTestCase.java	2009-04-15 11:59:31 UTC (rev 87337)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/JarFileURLTestCase.java	2009-04-15 12:16:16 UTC (rev 87338)
@@ -24,6 +24,7 @@
 import java.io.InputStream;
 import java.net.URL;
 
+import junit.framework.Test;
 import org.jboss.virtual.VFS;
 import org.jboss.virtual.VirtualFile;
 
@@ -38,8 +39,13 @@
       super(name);
    }
 
-   public void test1() throws Exception
+   public static Test suite()
    {
+      return suite(JarFileURLTestCase.class);
+   }
+
+   public void testStreamDirectAndURL() throws Exception
+   {
       URL url = getResource("/vfs/test/jar1.jar");
       URL manifestURL = new URL("jar:" + url.toExternalForm() + "!/META-INF/MANIFEST.MF");
       

Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/VFSAllTestSuite.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/VFSAllTestSuite.java	2009-04-15 11:59:31 UTC (rev 87337)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/VFSAllTestSuite.java	2009-04-15 12:16:16 UTC (rev 87338)
@@ -58,6 +58,7 @@
       suite.addTest(FileVFSContextUnitTestCase.suite());
       suite.addTest(FileVirtualFileHandlerUnitTestCase.suite());
       // jars
+      suite.addTest(JarFileURLTestCase.suite());
       suite.addTest(JARCacheUnitTestCase.suite());
       suite.addTest(CopyJARCacheUnitTestCase.suite());
       suite.addTest(JARVFSContextUnitTestCase.suite());