[jboss-cvs] JBossAS SVN: r78508 - projects/jboss-cl/trunk/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/policy.

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

Author: stan.silvert at jboss.com
Date: 2008-09-14 08:15:55 -0400 (Sun, 14 Sep 2008)
New Revision: 78508

Modified:
   projects/jboss-cl/trunk/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/policy/VFSClassLoaderPolicy.java
Log:
JBCL-43 PackageInformation retrieved from wrong jar


Modified: projects/jboss-cl/trunk/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/policy/VFSClassLoaderPolicy.java
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/policy/VFSClassLoaderPolicy.java	2008-09-14 11:07:05 UTC (rev 78507)
+++ projects/jboss-cl/trunk/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/policy/VFSClassLoaderPolicy.java	2008-09-14 12:15:55 UTC (rev 78508)
@@ -552,9 +552,22 @@
             VirtualFile file = root.getChild(path);
             if (file != null)
             {
-               result = new VirtualFileInfo(file, root);
-               vfsCache.put(path, result);
-               return result;
+               // Must either be a file...
+               if (file.isLeaf())
+               {
+                  result = new VirtualFileInfo(file, root);
+                  vfsCache.put(path, result);
+                  return result;
+               }
+               
+               // ... or have a child that is a file
+               for (VirtualFile child : file.getChildren())
+               {
+                  if (!child.isLeaf()) continue;
+                  result = new VirtualFileInfo(file, root);
+                  vfsCache.put(path, result);
+                  return result;
+               }
             }
          }
          catch (Exception ignored)