[jboss-cvs] JBossAS SVN: r66718 - 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: 2007-11-04 16:30:11 -0500 (Sun, 04 Nov 2007)
New Revision: 66718

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVirtualFileHandler.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/memory/MemoryContextHandler.java
Log:
Additional instance check.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVirtualFileHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVirtualFileHandler.java	2007-11-04 14:43:49 UTC (rev 66717)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVirtualFileHandler.java	2007-11-04 21:30:11 UTC (rev 66718)
@@ -60,8 +60,8 @@
    private static final ObjectStreamField[] serialPersistentFields = {
       new ObjectStreamField("rootURI", URI.class),
       new ObjectStreamField("parent", VirtualFileHandler.class),
-           new ObjectStreamField("name", String.class),
-           new ObjectStreamField("vfsUrl", URL.class)
+      new ObjectStreamField("name", String.class),
+      new ObjectStreamField("vfsUrl", URL.class)
    };
 
    /** The VFS context
@@ -82,11 +82,13 @@
    /** The vfsPath */
    private transient String vfsPath;
 
+   /** The vfs URL */
    protected URL vfsUrl;
 
    /** The reference count */
    private transient AtomicInteger references = new AtomicInteger(0);
 
+   /** The cached last modified */
    protected transient long cachedLastModified;
 
    /**
@@ -396,6 +398,7 @@
       fields.put("vfsUrl", vfsUrl);
       out.writeFields();
    }
+
    private void readObject(ObjectInputStream in)
       throws IOException, ClassNotFoundException
    {

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/memory/MemoryContextHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/memory/MemoryContextHandler.java	2007-11-04 14:43:49 UTC (rev 66717)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/memory/MemoryContextHandler.java	2007-11-04 21:30:11 UTC (rev 66718)
@@ -58,13 +58,13 @@
    public MemoryContextHandler(VFSContext context, VirtualFileHandler parent, URL url, String name)
    {
       super(context, parent, url, name);
-      if (parent != null)
+      if (parent != null && parent instanceof MemoryContextHandler)
       {
          ((MemoryContextHandler)parent).addChild(name, this);
       }
    }
 
-   private void addChild(String name, MemoryContextHandler child)
+   protected void addChild(String name, MemoryContextHandler child)
    {
       if (entryChildren == Collections.EMPTY_LIST)
       {
@@ -112,7 +112,7 @@
    public VirtualFileHandler createChildHandler(String name) throws IOException
    {
       VirtualFileHandler child = entryMap.get(name);
-      if( child == null )
+      if(child == null)
          throw new FileNotFoundException(this+" has no child: "+name);
       return child;
    }
@@ -173,20 +173,20 @@
    @Override
    public URL toVfsUrl() throws MalformedURLException, URISyntaxException
    {
-      if (super.vfsUrl == null)
+      if (vfsUrl == null)
       {
          if (isLeaf())
          {
-            super.vfsUrl = getURL();
+            vfsUrl = getURL();
          }
          else
          {
             String vfsString = getURL().toString(); 
-            if (!vfsString.endsWith("/"));
-            super.vfsUrl = new URL(vfsString + "/");
+            if (vfsString.endsWith("/") == false)
+               vfsUrl = new URL(vfsString + "/");
          }
       }
-      return super.vfsUrl;
+      return vfsUrl;
    }
    
 }