[jboss-cvs] JBossAS SVN: r66351 - 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-23 02:41:39 -0400 (Tue, 23 Oct 2007)
New Revision: 66351

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
Log:
Validate override for null

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java	2007-10-23 06:35:44 UTC (rev 66350)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java	2007-10-23 06:41:39 UTC (rev 66351)
@@ -576,11 +576,11 @@
          resourceManagers = new ResourceManagersMetaData();
       if(this.containerConfigurations == null)
          containerConfigurations = new ContainerConfigurationsMetaData();
-      if(override.containerConfigurations != null)
+      if(override != null && override.containerConfigurations != null)
          containerConfigurations.merge(override.containerConfigurations);
       if(this.invokerProxyBindings != null)
          invokerProxyBindings = new InvokerProxyBindingsMetaData();
-      if(override.invokerProxyBindings != null)
+      if(override != null && override.invokerProxyBindings != null)
          invokerProxyBindings.merge(override.invokerProxyBindings);
       if(this.webservices == null)
          webservices = new WebservicesMetaData();