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

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

Author: scott.stark at jboss.org
Date: 2007-10-19 02:35:30 -0400 (Fri, 19 Oct 2007)
New Revision: 66271

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java
Log:
Have an empty app metadata instance function

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java	2007-10-19 06:34:49 UTC (rev 66270)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java	2007-10-19 06:35:30 UTC (rev 66271)
@@ -221,31 +221,28 @@
    @XmlTransient
    public ModulesMetaData getMergedModules()
    {
-      ModulesMetaData merged = getOverridenMetaData().getModules();
+      EarMetaData emd = getOverridenMetaData();
+      ModulesMetaData merged = new ModulesMetaData();
+      if (emd != null && emd.getModules() != null)
+         merged.addAll(emd.getModules());
       if (modules != null && modules.size() > 0)
       {
-         if (merged == null)
-            merged = new ModulesMetaData();
          merged.addAll(modules);
       }
-      else if(merged == null)
-         merged = new ModulesMetaData();
       return merged;
    }
 
    @XmlTransient
    public SecurityRolesMetaData getMergedSecurityRoles()
    {
-      SecurityRolesMetaData securityRolesMetaData = getOverridenMetaData().getSecurityRoles();
+      EarMetaData emd = getOverridenMetaData();
+      SecurityRolesMetaData securityRolesMetaData = null;
+      if (emd != null)
+         securityRolesMetaData = emd.getSecurityRoles();
       SecurityRolesMetaData jbossSecurityRolesMetaData = securityRoles;
       SecurityRolesMetaData mergedSecurityRolesMetaData = new SecurityRolesMetaData();
-      if (jbossSecurityRolesMetaData == null || jbossSecurityRolesMetaData.isEmpty())
+      if (jbossSecurityRolesMetaData != null && jbossSecurityRolesMetaData.isEmpty() == false)
       {
-         if (securityRolesMetaData != null)
-            mergedSecurityRolesMetaData = securityRolesMetaData;
-      }
-      else
-      {
          mergedSecurityRolesMetaData = JavaEEMetaDataUtil.merge(
             mergedSecurityRolesMetaData,
             securityRolesMetaData, jbossSecurityRolesMetaData,