[jboss-cvs] JBossAS SVN: r83882 - branches/Branch_5_0/server/src/main/org/jboss/web/deployers.

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

Author: alesj
Date: 2009-02-05 03:28:49 -0500 (Thu, 05 Feb 2009)
New Revision: 83882

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

Modified: branches/Branch_5_0/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
===================================================================
--- branches/Branch_5_0/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java	2009-02-05 08:27:18 UTC (rev 83881)
+++ branches/Branch_5_0/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java	2009-02-05 08:28:49 UTC (rev 83882)
@@ -349,9 +349,11 @@
 
          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)
@@ -394,6 +396,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();