[jboss-cvs] JBossAS SVN: r68558 - projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar.

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

Author: alesj
Date: 2007-12-26 11:10:10 -0500 (Wed, 26 Dec 2007)
New Revision: 68558

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/JarEntryContents.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarFromStream.java
   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/NoCopyNestedJarHandler.java
Log:
Fix null vfs url and getChild for empty path.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/JarEntryContents.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/JarEntryContents.java	2007-12-26 11:53:11 UTC (rev 68557)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/JarEntryContents.java	2007-12-26 16:10:10 UTC (rev 68558)
@@ -122,6 +122,12 @@
 
    public VirtualFileHandler findChild(String path) throws IOException
    {
+      if (path == null)
+         throw new IllegalArgumentException("Null path");
+
+      if ("".equals(path))
+         return this;
+
       if (isJar)
       {
          initNestedJar();

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarFromStream.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarFromStream.java	2007-12-26 11:53:11 UTC (rev 68557)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarFromStream.java	2007-12-26 16:10:10 UTC (rev 68558)
@@ -26,6 +26,7 @@
 /**
  * A nested jar implementation used to represent a jar within a jar.
  *
+ * @author Ales.Justin at jboss.org
  * @author Scott.Stark at jboss.org
  * @version $Revision: 44334 $
  */
@@ -127,6 +128,12 @@
 
    public VirtualFileHandler findChild(String path) throws IOException
    {
+      if (path == null)
+         throw new IllegalArgumentException("Null path");
+
+      if ("".equals(path))
+         return this;
+
       JarEntryContents handler = getEntry(path);
       if (handler == null)
          throw new IOException("No such child: " + path);

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	2007-12-26 11:53:11 UTC (rev 68557)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarHandler.java	2007-12-26 16:10:10 UTC (rev 68558)
@@ -137,6 +137,7 @@
 
       try
       {
+         setPathName(getChildPathName(entryName, false));
          setVfsUrl(getChildVfsUrl(entryName, false));
       }
       catch (URISyntaxException e)

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NoCopyNestedJarHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NoCopyNestedJarHandler.java	2007-12-26 11:53:11 UTC (rev 68557)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NoCopyNestedJarHandler.java	2007-12-26 16:10:10 UTC (rev 68558)
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.net.URISyntaxException;
 import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
@@ -65,6 +66,16 @@
       
       try
       {
+         setPathName(getChildPathName(entryName, false));
+         setVfsUrl(getChildVfsUrl(entryName, false));
+      }
+      catch (URISyntaxException e)
+      {
+         throw new RuntimeException(e);
+      }
+
+      try
+      {
          InputStream is = parentJar.getInputStream(entry);
          ZipInputStream zis;
          if( (is instanceof ZipInputStream) )
@@ -110,6 +121,12 @@
 
    public VirtualFileHandler findChild(String path) throws IOException
    {
+      if (path == null)
+         throw new IllegalArgumentException("Null path");
+
+      if ("".equals(path))
+         return this;
+
       return njar.findChild(path);
    }