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

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

Author: scott.stark at jboss.org
Date: 2007-10-16 14:56:58 -0400 (Tue, 16 Oct 2007)
New Revision: 66192

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/ContainerConfigurationsMetaDataWrapper.java
Log:
Deal with a null primary container configuration

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/ContainerConfigurationsMetaDataWrapper.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/ContainerConfigurationsMetaDataWrapper.java	2007-10-16 17:59:16 UTC (rev 66191)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/ContainerConfigurationsMetaDataWrapper.java	2007-10-16 18:56:58 UTC (rev 66192)
@@ -30,6 +30,7 @@
 import org.jboss.metadata.ejb.jboss.ContainerConfigurationsMetaData;
 
 /**
+ * Wrapper for jboss.xml/standardjboss.xml type of primary/defaults
  * @author Scott.Stark at jboss.org
  * @version $Revision$
  */
@@ -40,11 +41,20 @@
    private ContainerConfigurationsMetaData defaults;
    private HashMap<String, ContainerConfigurationMetaData> merged = new HashMap<String, ContainerConfigurationMetaData>();
 
+   /**
+    * create a wrapper for jboss.xml/standardjboss.xml type of primary/defaults
+    * @param primary - the jboss.xml container configuration metadata
+    * @param defaults - the standardjboss.xml container configuration metadata
+    */
    ContainerConfigurationsMetaDataWrapper(ContainerConfigurationsMetaData primary,
       ContainerConfigurationsMetaData defaults)
    {
       this.primary = primary;
       this.defaults = defaults;
+      if(defaults == null)
+         throw new IllegalStateException("defaults cannot be null");
+
+      if(defaults != null)
       for(String key : defaults.keySet())
       {
          ContainerConfigurationMetaData md = defaults.get(key);
@@ -57,6 +67,7 @@
          }
          merged.put(key, md);
       }
+      if(primary != null)
       for(String key : primary.keySet())
       {
          ContainerConfigurationMetaData md = primary.get(key);
@@ -86,12 +97,20 @@
 
    public Descriptions getDescriptions()
    {
-      return new DescriptionsWrapper(primary.getDescriptions(), defaults.getDescriptions());
+      Descriptions descriptions = null;
+      if(primary != null )
+         descriptions = primary.getDescriptions();
+      if(descriptions == null)
+         descriptions = defaults.getDescriptions();
+      return descriptions;
    }
 
    public String getId()
    {
-      return primary.getId();
+      String id = primary != null ? primary.getId() : null;
+      if(id == null)
+         id = defaults.getId();
+      return id;
    }
 
    public boolean isEmpty()