[jboss-cvs] JBossAS SVN: r96288 - projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec.

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

Author: remy.maucherat at jboss.com
Date: 2009-11-11 21:50:33 -0500 (Wed, 11 Nov 2009)
New Revision: 96288

Modified:
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebCommonMetaData.java
Log:
- Fix distributable merging, which is quite special compared to the other elements.

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebCommonMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebCommonMetaData.java	2009-11-12 00:41:49 UTC (rev 96287)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebCommonMetaData.java	2009-11-12 02:50:33 UTC (rev 96288)
@@ -527,9 +527,9 @@
    {
 
       // Distributable
-      if (getDistributable() == null || webFragmentMetaData.getDistributable() == null)
+      if (!resolveConflicts && webFragmentMetaData.getDistributable() == null && webMetaData != null)
       {
-         setDistributable(null);
+         webMetaData.setDistributable(null);
       }
       
       // Context params