[jboss-cvs] JBossAS SVN: r84093 - in projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins: registry and 1 other directory.

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

Author: alesj
Date: 2009-02-11 10:16:51 -0500 (Wed, 11 Feb 2009)
New Revision: 84093

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVFSContext.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/registry/DefaultVFSRegistry.java
Log:
Do validation at vfs context.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVFSContext.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVFSContext.java	2009-02-11 14:33:42 UTC (rev 84092)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVFSContext.java	2009-02-11 15:16:51 UTC (rev 84093)
@@ -350,12 +350,39 @@
 
    public TempInfo getTempInfo(String path)
    {
-      return tempInfos.get(path);
+      TempInfo tempInfo = tempInfos.get(path);
+      if (tempInfo == null)
+      {
+         return null;
+      }
+      else if (tempInfo.isValid() == false)
+      {
+         tempInfos.remove(path);
+         return null;
+      }
+      else
+      {
+         return tempInfo;
+      }
    }
 
    public Iterable<TempInfo> getTempInfos()
    {
-      return tempInfos.values();
+      Map<String, TempInfo> result = new TreeMap<String, TempInfo>();
+      Iterator<Map.Entry<String, TempInfo>> iter = tempInfos.entrySet().iterator();
+      while(iter.hasNext())
+      {
+         Map.Entry<String, TempInfo> entry = iter.next();
+         if (entry.getValue().isValid())
+         {
+            result.put(entry.getKey(), entry.getValue());
+         }
+         else
+         {
+            iter.remove();
+         }
+      }
+      return result.values();
    }
 
    public void cleanupTempInfo(String path)

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/registry/DefaultVFSRegistry.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/registry/DefaultVFSRegistry.java	2009-02-11 14:33:42 UTC (rev 84092)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/registry/DefaultVFSRegistry.java	2009-02-11 15:16:51 UTC (rev 84093)
@@ -75,7 +75,7 @@
          for (TempInfo ti : context.getTempInfos())
          {
             String path = ti.getPath();
-            if (relativePath.startsWith(path) && ti.isValid())
+            if (relativePath.startsWith(path))
             {
                String subpath = relativePath.substring(path.length());
                VirtualFileHandler child = findHandler(ti.getHandler(), subpath);