[jboss-cvs] JBossAS SVN: r100986 - branches/Branch_6_0_0_M2/server/src/main/java/org/jboss/web/deployers.

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

Author: bstansberry at jboss.com
Date: 2010-02-15 14:48:41 -0500 (Mon, 15 Feb 2010)
New Revision: 100986

Modified:
   branches/Branch_6_0_0_M2/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
Log:
[JBAS-7736] Only override distibutable with values from real web fragments

Modified: branches/Branch_6_0_0_M2/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
===================================================================
--- branches/Branch_6_0_0_M2/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java	2010-02-15 19:48:01 UTC (rev 100985)
+++ branches/Branch_6_0_0_M2/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java	2010-02-15 19:48:41 UTC (rev 100986)
@@ -374,6 +374,9 @@
          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());
          }
          key = AnnotationMetaDataDeployer.WEB_ANNOTATED_ATTACHMENT_NAME + ":" + jar;
          WebMetaData jarAnnotatedMetaData = unit.getAttachment(key, WebMetaData.class);
@@ -405,6 +408,9 @@
       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());
          key = AnnotationMetaDataDeployer.WEB_ANNOTATED_ATTACHMENT_NAME + ":" + jar;
          WebMetaData jarAnnotatedMetaData = unit.getAttachment(key, WebMetaData.class);
          if (jarAnnotatedMetaData != null)