[jboss-cvs] JBossAS SVN: r68570 - 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-26 14:09:27 -0500 (Wed, 26 Dec 2007)
New Revision: 68570

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/NestedJarFromStream.java
Log:
Remove last slash on entry directory.

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-26 18:55:31 UTC (rev 68569)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVirtualFileHandler.java	2007-12-26 19:09:27 UTC (rev 68570)
@@ -137,7 +137,7 @@
       if (vfsUrlString.length() > 0 && vfsUrlString.endsWith("/") == false)
          vfsUrlString += "/";
       vfsUrlString += childPath;
-      if (isDirectory)
+      if (isDirectory && vfsUrlString.endsWith("/") == false)
          vfsUrlString += "/";
       return new URL(vfsUrlString);
    }

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 18:55:31 UTC (rev 68569)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/NestedJarFromStream.java	2007-12-26 19:09:27 UTC (rev 68570)
@@ -102,7 +102,8 @@
                String url = toURI().toASCIIString() + "!/" + entryName;
                URL jecURL = new URL(url);
                JarEntryContents jec = new JarEntryContents(getVFSContext(), this, entry, toURL(), jecURL, zis);
-               entries.put(entryName, jec);
+               int end = entry.isDirectory() ? entryName.length() - 1 : entryName.length();
+               entries.put(entryName.substring(0, end), jec);
                entry = zis.getNextEntry();
             }
             catch (Throwable t)