[Jboss-cvs] JBossAS SVN: r56609 - projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/file

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

Author: adrian at jboss.org
Date: 2006-09-07 06:55:33 -0400 (Thu, 07 Sep 2006)
New Revision: 56609

Modified:
   projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/file/FileSystemContext.java
Log:
[JBMICROCONT-57] - Treat something that looks like a jar as a normal
file if it cannot be opened as a jar.
Also fixed a remaining trailing / problem.

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/file/FileSystemContext.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/file/FileSystemContext.java	2006-09-07 10:54:27 UTC (rev 56608)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/file/FileSystemContext.java	2006-09-07 10:55:33 UTC (rev 56609)
@@ -25,6 +25,7 @@
 import java.io.IOException;
 import java.net.URL;
 
+import org.jboss.virtual.VFSUtils;
 import org.jboss.virtual.VirtualFile;
 import org.jboss.virtual.plugins.context.AbstractVFSContext;
 import org.jboss.virtual.plugins.context.jar.JarHandler;
@@ -73,7 +74,10 @@
    {
       if (file == null)
          throw new IllegalArgumentException("Null file");
-      return file.toURL();
+      URL url = file.toURL();
+      String path = url.getPath();
+      path = VFSUtils.fixName(path);
+      return new URL("file", null, path);
    }
    
    /**
@@ -137,7 +141,14 @@
       {
          URL url = JarUtils.createJarURL(fileURL);
          String name = file.getName();
-         return new JarHandler(this, parent, url, name);
+         try
+         {
+            return new JarHandler(this, parent, url, name);
+         }
+         catch (IOException e)
+         {
+            log.debug(e.getMessage());
+         }
       }
       return createVirtualFileHandler(parent, file, fileURL);
    }