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

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

Author: alesj
Date: 2006-09-10 09:45:18 -0400 (Sun, 10 Sep 2006)
New Revision: 56702

Modified:
   projects/microcontainer/trunk/container/src/main/org/jboss/virtual/VFSUtils.java
   projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/file/LinkHandler.java
Log:
FIS closing, loop breaking.

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/virtual/VFSUtils.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/virtual/VFSUtils.java	2006-09-10 12:38:06 UTC (rev 56701)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/virtual/VFSUtils.java	2006-09-10 13:45:18 UTC (rev 56702)
@@ -209,7 +209,7 @@
    /**
     * 
     * @param uri
-    * @return
+    * @return name from uri's path
     */
    public static String getName(URI uri)
    {
@@ -297,6 +297,11 @@
          String name = props.getProperty(nameKey);
          String uriKey = "link.uri." + n;
          String uri = props.getProperty(uriKey);
+         // fixme - should break this 'for loop'
+         if (name == null || uri == null)
+         {
+            break;
+         }
          LinkInfo link = new LinkInfo(name, new URI(uri));
          info.add(link);
       }

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/file/LinkHandler.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/file/LinkHandler.java	2006-09-10 12:38:06 UTC (rev 56701)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/file/LinkHandler.java	2006-09-10 13:45:18 UTC (rev 56702)
@@ -79,6 +79,10 @@
          ex.initCause(e);
          throw ex;
       }
+      finally
+      {
+          fis.close();
+      }
    }
 
    @Override