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

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

Author: alesj
Date: 2009-02-18 14:50:54 -0500 (Wed, 18 Feb 2009)
New Revision: 84408

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVirtualFileHandler.java
Log:
Get off URL(URL, path) usage.

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	2009-02-18 19:25:22 UTC (rev 84407)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVirtualFileHandler.java	2009-02-18 19:50:54 UTC (rev 84408)
@@ -318,7 +318,18 @@
                   VirtualFileHandler handler = oldRoot.getChild(path);
                   if (handler == null)
                   {
-                     vfsUrlCached = new URL(oldRoot.toVfsUrl(), path);
+                     URL oldRootURL = oldRoot.toVfsUrl();
+                     if (path != null && path.length() > 0)
+                     {
+                        String oldRootURLString = oldRootURL.toExternalForm();
+                        if (oldRootURLString.endsWith("/") == false && path.startsWith("/") == false)
+                           oldRootURLString += "/";
+                        vfsUrlCached = new URL(oldRootURLString + path);
+                     }
+                     else
+                     {
+                        vfsUrlCached = oldRootURL;
+                     }
                      log.warn("No such existing handler, falling back to old root + path: " + vfsUrlCached);
                   }
                   else