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

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

Author: remy.maucherat at jboss.com
Date: 2009-11-05 19:39:50 -0500 (Thu, 05 Nov 2009)
New Revision: 96070

Modified:
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossAnnotationMetaData.java
Log:
- Need to merge the class annotations to JBossWebMetaData.

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossAnnotationMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossAnnotationMetaData.java	2009-11-06 00:14:23 UTC (rev 96069)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossAnnotationMetaData.java	2009-11-06 00:39:50 UTC (rev 96070)
@@ -47,5 +47,19 @@
    public void merge(JBossAnnotationMetaData override, AnnotationMetaData original)
    {
       super.merge(override, original);
+      
+      if(override != null && override.getServletSecurity()!= null)
+         setServletSecurity(override.getServletSecurity());
+      else if(original != null && original.getServletSecurity() != null)
+         setServletSecurity(original.getServletSecurity());
+      if(override != null && override.getRunAs()!= null)
+         setRunAs(override.getRunAs());
+      else if(original != null && original.getRunAs() != null)
+         setRunAs(original.getRunAs());
+      if(override != null && override.getMultipartConfig()!= null)
+         setMultipartConfig(override.getMultipartConfig());
+      else if(original != null && original.getMultipartConfig() != null)
+         setMultipartConfig(original.getMultipartConfig());
+
    }
 }