[jboss-cvs] JBossAS SVN: r80501 - projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/dependency.

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

Author: alesj
Date: 2008-11-04 09:40:56 -0500 (Tue, 04 Nov 2008)
New Revision: 80501

Modified:
   projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/dependency/VFSClassLoaderPolicyModule.java
Log:
Port trunk changes to branch - JBCL-63.

Modified: projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/dependency/VFSClassLoaderPolicyModule.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/dependency/VFSClassLoaderPolicyModule.java	2008-11-04 14:37:01 UTC (rev 80500)
+++ projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/dependency/VFSClassLoaderPolicyModule.java	2008-11-04 14:40:56 UTC (rev 80501)
@@ -45,7 +45,7 @@
 
 /**
  * VFSClassLoaderPolicyModule.
- * 
+ *
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision: 1.1 $
  */
@@ -56,13 +56,13 @@
 
    /** The roots */
    private List<String> roots;
-   
+
    /** Our cached vfs roots */
    private VirtualFile[] vfsRoots;
-   
+
    /**
     * Create a new VFSClassLoaderPolicyModule.
-    * 
+    *
     * @param classLoadingMetaData the classloading metadata
     * @param contextName the context name
     */
@@ -70,10 +70,10 @@
    {
       super(classLoadingMetaData, contextName);
    }
-   
+
    /**
     * Get the roots.
-    * 
+    *
     * @return the roots.
     */
    public List<String> getRoots()
@@ -83,7 +83,7 @@
 
    /**
     * Set the roots.
-    * 
+    *
     * @param roots the roots.
     */
    public void setRoots(List<String> roots)
@@ -100,7 +100,7 @@
       List<Capability> capabilities = super.determineCapabilities();
       if (capabilities != null)
          return capabilities;
-         
+
       // We need to work it out
       ClassLoadingMetaDataFactory factory = ClassLoadingMetaDataFactory.getInstance();
       capabilities = new CopyOnWriteArrayList<Capability>();
@@ -109,7 +109,7 @@
       Object version = getVersion();
       Capability capability = factory.createModule(getName(), version);
       capabilities.add(capability);
-      
+
       // Do we determine package capabilities
       ClassFilter included = getIncluded();
       ClassFilter excluded = getExcluded();
@@ -124,7 +124,7 @@
             capabilities.add(capability);
          }
       }
-      
+
       return capabilities;
    }
 
@@ -143,17 +143,17 @@
    {
       return (VFSClassLoaderFactory) super.getClassLoadingMetaData();
    }
-   
+
    /**
     * Get the virtual file roots
-    * 
+    *
     * @return the roots
     */
    protected VirtualFile[] determineVFSRoots()
    {
       if (vfsRoots != null)
          return vfsRoots;
-      
+
       if (roots == null)
       {
          vfsRoots = new VirtualFile[0];
@@ -192,7 +192,10 @@
     */
    protected VirtualFile getVirtualFile(URI uri) throws Exception
    {
-      return VFS.getCachedFile(uri);
+      if (isCacheable())
+         return VFS.getCachedFile(uri);
+      else
+         return VFS.getRoot(uri);
    }
 
    @Override
@@ -200,7 +203,7 @@
    {
       return (VFSClassLoaderPolicy) super.getPolicy();
    }
-   
+
    @Override
    protected VFSClassLoaderPolicy determinePolicy()
    {