[jboss-cvs] JBossAS SVN: r79386 - trunk/server/src/main/org/jboss/deployment.

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

Author: alesj
Date: 2008-10-13 07:27:43 -0400 (Mon, 13 Oct 2008)
New Revision: 79386

Modified:
   trunk/server/src/main/org/jboss/deployment/LegacyWebXmlLessDeployer.java
Log:
[JBAS-6061]; use the .war check first.

Modified: trunk/server/src/main/org/jboss/deployment/LegacyWebXmlLessDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/LegacyWebXmlLessDeployer.java	2008-10-13 11:11:54 UTC (rev 79385)
+++ trunk/server/src/main/org/jboss/deployment/LegacyWebXmlLessDeployer.java	2008-10-13 11:27:43 UTC (rev 79386)
@@ -47,15 +47,15 @@
 
    public void deploy(DeploymentUnit unit) throws DeploymentException
    {
-      if (unit.isAttachmentPresent(JBossWebMetaData.class))
-         return;
+      if (unit.getSimpleName().endsWith(".war"))
+      {
+         if (unit.isAttachmentPresent(JBossWebMetaData.class))
+            return;
 
-      // only care about true deployments
-      if (unit instanceof VFSDeploymentUnit == false)
-         return;
+         // only care about true deployments
+         if (unit instanceof VFSDeploymentUnit == false)
+            return;
 
-      if (unit.getSimpleName().endsWith(".war"))
-      {
          log.debug("Web archive doesn't contain web.xml: " + unit.getName());
          unit.getTransientManagedObjects().addAttachment(JBossWebMetaData.class, new JBossWebMetaData());
       }