[jboss-cvs] JBossAS SVN: r83862 - trunk/server/src/main/org/jboss/web/deployers.

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

Author: alesj
Date: 2009-02-04 13:24:14 -0500 (Wed, 04 Feb 2009)
New Revision: 83862

Modified:
   trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
Log:
Simplify exploded check.

Modified: trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java	2009-02-04 18:19:33 UTC (rev 83861)
+++ trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java	2009-02-04 18:24:14 UTC (rev 83862)
@@ -347,14 +347,13 @@
          {
             VFSDeploymentUnit vfsUnit = (VFSDeploymentUnit)unit;
             VirtualFile root = vfsUnit.getRoot();
-            URL expWarUrl = root.toURL();
-            VirtualFile explode = VFSUtils.explode(root);
-            boolean exploded = (root != explode);
+            URL expWarUrl = VFSUtils.getRealURL(root);
+            VirtualFile exploded = VFSUtils.explode(root);
             // file was not exploded yet
-            if (exploded)
+            if (root != exploded)
             {
                // get the real exploded url
-               expWarUrl = VFSUtils.getRealURL(explode);
+               expWarUrl = VFSUtils.getRealURL(exploded);
 
                // Map
                String warPathName = root.getPathName();