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

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

Author: alesj
Date: 2009-02-05 03:19:30 -0500 (Thu, 05 Feb 2009)
New Revision: 83878

Modified:
   trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
Log:
Delay url read.

Modified: trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java	2009-02-05 07:58:37 UTC (rev 83877)
+++ trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java	2009-02-05 08:19:30 UTC (rev 83878)
@@ -345,9 +345,10 @@
 
          if (unit instanceof VFSDeploymentUnit)
          {
+            URL expWarUrl;
+
             VFSDeploymentUnit vfsUnit = (VFSDeploymentUnit)unit;
             VirtualFile root = vfsUnit.getRoot();
-            URL expWarUrl = VFSUtils.getRealURL(root);
             VirtualFile exploded = VFSUtils.explode(root);
             // file was not exploded yet
             if (root != exploded)
@@ -390,6 +391,10 @@
                // Indicate that an expanded URL exists
                unit.addAttachment("org.jboss.web.expandedWarURL", expWarUrl, URL.class);
             }
+            else
+            {
+               expWarUrl = VFSUtils.getRealURL(root);
+            }
 
             // Resolve any ear relative alt-dd path to an expWarUrl/WEB-INF/alt-dd.xml file
             String altDDPath = metaData.getAlternativeDD();