[jboss-cvs] JBossAS SVN: r96448 - trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers.

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

Author: bstansberry at jboss.com
Date: 2009-11-16 14:25:26 -0500 (Mon, 16 Nov 2009)
New Revision: 96448

Modified:
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/ClusteringDefaultsDeployer.java
Log:
Avoid deployer ordering issues by not worrying whether web app is distributable.

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/ClusteringDefaultsDeployer.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/ClusteringDefaultsDeployer.java	2009-11-16 19:22:21 UTC (rev 96447)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/ClusteringDefaultsDeployer.java	2009-11-16 19:25:26 UTC (rev 96448)
@@ -214,14 +214,11 @@
    public void deploy(DeploymentUnit unit) throws DeploymentException
    {
       JBossWebMetaData metaData = unit.getAttachment(JBossWebMetaData.class);
-      if( metaData != null && metaData.getDistributable() != null )
+      if( metaData != null)
       {
-         if (metaData.getDistributable() != null)
-         {
-            addReplicationConfigDefaults(metaData);
+         addReplicationConfigDefaults(metaData);
             
-            addPassivationConfigDefaults(metaData);
-         }
+         addPassivationConfigDefaults(metaData);
       }
    }