[jboss-cvs] JBossAS SVN: r68580 - 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: 2007-12-29 09:57:10 -0500 (Sat, 29 Dec 2007)
New Revision: 68580

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVirtualFileHandler.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/JarEntryContents.java
Log:
Fix parent.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVirtualFileHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVirtualFileHandler.java	2007-12-29 14:04:31 UTC (rev 68579)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVirtualFileHandler.java	2007-12-29 14:57:10 UTC (rev 68580)
@@ -157,7 +157,7 @@
       if (childPathName.length() > 0 && childPathName.endsWith("/") == false)
          childPathName += "/";
       childPathName += childPath;
-      if (isDirectory)
+      if (isDirectory && childPathName.endsWith("/") == false)
          childPathName += "/";
       return childPathName;
    }

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-29 14:04:31 UTC (rev 68579)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/JarEntryContents.java	2007-12-29 14:57:10 UTC (rev 68580)
@@ -250,7 +250,7 @@
       {
          ByteArrayInputStream bais = new ByteArrayInputStream(contents);
          ZipInputStream zis = new ZipInputStream(bais);
-         njar = new NestedJarFromStream(getVFSContext(), this, zis, entryURL, null, getEntry(), getName());
+         njar = new NestedJarFromStream(getVFSContext(), getParent(), zis, entryURL, null, getEntry(), getName());
       }
    }
 }