[jboss-cvs] JBossAS SVN: r68581 - 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-30 07:36:01 -0500 (Sun, 30 Dec 2007)
New Revision: 68581

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/FileHandler.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/JarContext.java
Log:
Simple refactoring.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/FileHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/FileHandler.java	2007-12-29 14:57:10 UTC (rev 68580)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/FileHandler.java	2007-12-30 12:36:01 UTC (rev 68581)
@@ -71,7 +71,7 @@
       this.file = file;
       if (file.exists() == false)
          throw new FileNotFoundException("File does not exist: " + file.getCanonicalPath());
-      setVfsUrl(new URL("vfs" + url.toString()));
+      setVfsUrl(new URL("vfs" + url));
    }
    /**
     * Create a new FileHandler
@@ -92,7 +92,7 @@
    {
       if (getVfsUrl() == null)
       {
-         setVfsUrl(new URL("vfs" + getURL().toString()));
+         setVfsUrl(new URL("vfs" + getURL()));
       }
       return getVfsUrl();
    }

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/JarContext.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/JarContext.java	2007-12-29 14:57:10 UTC (rev 68580)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/jar/JarContext.java	2007-12-30 12:36:01 UTC (rev 68581)
@@ -83,7 +83,9 @@
       String entryPath = urlStr;
       entryPath = entryPath(entryPath);
       JarHandler jar =  new JarHandler(this, parent, url, jarName);
-      if (entryPath == null) return jar;
+      if (entryPath == null)
+         return jar;
+      
       // todo This is a hack until we can fix http://jira.jboss.com/jira/browse/JBMICROCONT-164
       AbstractVirtualFileHandler result = (AbstractVirtualFileHandler)jar.findChild(entryPath);
       result.setPathName("");