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

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

Author: alesj
Date: 2008-04-17 09:10:41 -0400 (Thu, 17 Apr 2008)
New Revision: 72350

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/MemoryFileFactory.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/memory/MemoryContextFactory.java
Log:
Hide MemoryContext on MCF.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/MemoryFileFactory.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/MemoryFileFactory.java	2008-04-17 13:07:22 UTC (rev 72349)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/MemoryFileFactory.java	2008-04-17 13:10:41 UTC (rev 72350)
@@ -26,7 +26,6 @@
 import java.net.URL;
 
 import org.jboss.virtual.plugins.context.memory.MemoryContextFactory;
-import org.jboss.virtual.spi.VFSContext;
 
 /**
  * Memory VFS API.
@@ -45,8 +44,7 @@
     */
    public static VFS find(String host)
    {
-      VFSContext context = factory.find(host);
-      return context != null ? context.getVFS() : null;
+      return factory.find(host);
    }
 
    /**

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/memory/MemoryContextFactory.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/memory/MemoryContextFactory.java	2008-04-17 13:07:22 UTC (rev 72349)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/memory/MemoryContextFactory.java	2008-04-17 13:10:41 UTC (rev 72350)
@@ -29,6 +29,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.jboss.virtual.VFS;
 import org.jboss.virtual.VirtualFile;
 import org.jboss.virtual.spi.VFSContext;
 import org.jboss.virtual.spi.VFSContextFactory;
@@ -81,9 +82,10 @@
     * @param host The name of the root
     * @return the found root MemoryContext, or null if none exists for the name 
     */
-   public MemoryContext find(String host)
+   public VFS find(String host)
    {
-      return registry.get(host);
+      MemoryContext context = registry.get(host);
+      return context != null ? context.getVFS() : null;
    }
    
    /**
@@ -103,7 +105,7 @@
          }
          
          String rootName = url.getHost();
-         MemoryContext ctx = find(rootName);
+         MemoryContext ctx = registry.get(rootName);
          if (ctx == null)
          {
             URL ctxURL = new URL("vfsmemory://" + rootName);