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

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

Author: remy.maucherat at jboss.com
Date: 2010-02-15 15:17:59 -0500 (Mon, 15 Feb 2010)
New Revision: 100988

Modified:
   trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
Log:
- It is clearer to set a real value, as this is the real default in this situation.

Modified: trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java	2010-02-15 19:53:35 UTC (rev 100987)
+++ trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java	2010-02-15 20:17:59 UTC (rev 100988)
@@ -39,6 +39,7 @@
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.deployment.AnnotationMetaDataDeployer;
 import org.jboss.metadata.ear.jboss.JBossAppMetaData;
+import org.jboss.metadata.javaee.spec.EmptyMetaData;
 import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
 import org.jboss.metadata.web.spec.AbsoluteOrderingMetaData;
@@ -374,9 +375,8 @@
          if (webFragmentMetaData == null)
          {
             webFragmentMetaData = new WebFragmentMetaData();
-            // JBAS-7736 -- don't let a default "distributable == null" from a non-existent
-            // fragment drive the final value in the augmented metadata
-            webFragmentMetaData.setDistributable(specMetaData.getDistributable());
+            // Add non overriding default distributable flag
+            webFragmentMetaData.setDistributable(new EmptyMetaData());
          }
          key = AnnotationMetaDataDeployer.WEB_ANNOTATED_ATTACHMENT_NAME + ":" + jar;
          WebMetaData jarAnnotatedMetaData = unit.getAttachment(key, WebMetaData.class);
@@ -408,9 +408,8 @@
       for (String jar : jarsSet)
       {
          WebFragmentMetaData webFragmentMetaData = new WebFragmentMetaData();
-         // JBAS-7736 -- don't let a default "distributable == null" from a non-existent
-         // fragment drive the final value in the augmented metadata
-         webFragmentMetaData.setDistributable(specMetaData.getDistributable());
+         // Add non overriding default distributable flag
+         webFragmentMetaData.setDistributable(new EmptyMetaData());
          key = AnnotationMetaDataDeployer.WEB_ANNOTATED_ATTACHMENT_NAME + ":" + jar;
          WebMetaData jarAnnotatedMetaData = unit.getAttachment(key, WebMetaData.class);
          if (jarAnnotatedMetaData != null)