[jboss-cvs] JBossAS SVN: r82774 - projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context.

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

Author: alesj
Date: 2009-01-12 10:39:33 -0500 (Mon, 12 Jan 2009)
New Revision: 82774

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVirtualFileHandler.java
Log:
Simple refactoring.

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	2009-01-12 15:17:47 UTC (rev 82773)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/AbstractVirtualFileHandler.java	2009-01-12 15:39:33 UTC (rev 82774)
@@ -313,7 +313,12 @@
       return false;
    }
 
-
+   /**
+    * Initialise the peer path.
+    *
+    * @param pathName the path name
+    * @return whether it added anything
+    */
    private boolean initPeerPath(StringBuilder pathName)
    {
       VirtualFileHandler grandParent = null;
@@ -332,17 +337,16 @@
          }
       }
 
-      VirtualFileHandler peer = context.getRootPeer();
-
-
       if (grandParent == null)
       {
+         VirtualFileHandler peer = context.getRootPeer();
+
          // bypass parent and delegate straight to peer
 
          if (peer instanceof AbstractVirtualFileHandler)
          {
             AbstractVirtualFileHandler handler = (AbstractVirtualFileHandler) peer;
-            if (handler.initPath(pathName) && parent != null)
+            if (parent != null && handler.initPath(pathName))
                pathName.append('/');
          }
          else
@@ -384,8 +388,8 @@
       {
          if (context instanceof AbstractVFSContext)
          {
-            AbstractVFSContext avfs = (AbstractVFSContext) context;
-            VirtualFileHandler peer = avfs.getRootPeer();
+            AbstractVFSContext avfc = (AbstractVFSContext) context;
+            VirtualFileHandler peer = avfc.getRootPeer();
             if (peer != null)
                return peer.getParent();
          }