[jboss-cvs] JBossAS SVN: r66754 - 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-11-05 22:35:08 -0500 (Mon, 05 Nov 2007)
New Revision: 66754

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
Log:
Validate the jndi env for null

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java	2007-11-06 03:17:30 UTC (rev 66753)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java	2007-11-06 03:35:08 UTC (rev 66754)
@@ -889,7 +889,10 @@
    @XmlTransient
    public EJBLocalReferencesMetaData getEjbLocalReferences()
    {
-      return jndiEnvironmentRefsGroup.getEjbLocalReferences();
+      EJBLocalReferencesMetaData refs = null;
+      if(jndiEnvironmentRefsGroup != null)
+         refs = jndiEnvironmentRefsGroup.getEjbLocalReferences();
+      return refs;
    }
 
    public EJBReferenceMetaData getEjbReferenceByName(String name)
@@ -900,13 +903,19 @@
    @XmlTransient
    public EJBReferencesMetaData getEjbReferences()
    {
-      return jndiEnvironmentRefsGroup.getEjbReferences();
+      EJBReferencesMetaData refs = null;
+      if(jndiEnvironmentRefsGroup != null)
+         refs = jndiEnvironmentRefsGroup.getEjbReferences();
+      return refs;
    }
 
    @XmlTransient
    public EnvironmentEntriesMetaData getEnvironmentEntries()
    {
-      return jndiEnvironmentRefsGroup.getEnvironmentEntries();
+      EnvironmentEntriesMetaData env = null;
+      if(jndiEnvironmentRefsGroup != null)
+         env = jndiEnvironmentRefsGroup.getEnvironmentEntries();
+      return env;
    }
 
    public EnvironmentEntryMetaData getEnvironmentEntryByName(String name)
@@ -922,7 +931,10 @@
    @XmlTransient
    public MessageDestinationReferencesMetaData getMessageDestinationReferences()
    {
-      return jndiEnvironmentRefsGroup.getMessageDestinationReferences();
+      MessageDestinationReferencesMetaData refs = null;
+      if(jndiEnvironmentRefsGroup != null)
+         refs = jndiEnvironmentRefsGroup.getMessageDestinationReferences();
+      return refs;
    }
 
    public PersistenceContextReferenceMetaData getPersistenceContextReferenceByName(String name)
@@ -933,7 +945,10 @@
    @XmlTransient
    public PersistenceContextReferencesMetaData getPersistenceContextRefs()
    {
-      return jndiEnvironmentRefsGroup.getPersistenceContextRefs();
+      PersistenceContextReferencesMetaData refs = null;
+      if(jndiEnvironmentRefsGroup != null)
+         refs = jndiEnvironmentRefsGroup.getPersistenceContextRefs();
+      return refs;
    }
 
    public PersistenceUnitReferenceMetaData getPersistenceUnitReferenceByName(String name)
@@ -944,7 +959,10 @@
    @XmlTransient
    public PersistenceUnitReferencesMetaData getPersistenceUnitRefs()
    {
-      return jndiEnvironmentRefsGroup.getPersistenceUnitRefs();
+      PersistenceUnitReferencesMetaData refs = null;
+      if(jndiEnvironmentRefsGroup != null)
+         refs = jndiEnvironmentRefsGroup.getPersistenceUnitRefs();
+      return refs;
    }
 
    public PoolConfigMetaData getPoolConfig()
@@ -955,13 +973,19 @@
    @XmlTransient
    public LifecycleCallbacksMetaData getPostConstructs()
    {
-      return jndiEnvironmentRefsGroup.getPostConstructs();
+      LifecycleCallbacksMetaData lcs = null;
+      if(jndiEnvironmentRefsGroup != null)
+         lcs = jndiEnvironmentRefsGroup.getPostConstructs();
+      return lcs;
    }
 
    @XmlTransient
    public LifecycleCallbacksMetaData getPreDestroys()
    {
-      return jndiEnvironmentRefsGroup.getPreDestroys();
+      LifecycleCallbacksMetaData lcs = null;
+      if(jndiEnvironmentRefsGroup != null)
+         lcs = jndiEnvironmentRefsGroup.getPreDestroys();
+      return lcs;
    }
 
    public ResourceEnvironmentReferenceMetaData getResourceEnvironmentReferenceByName(String name)
@@ -972,7 +996,10 @@
    @XmlTransient
    public ResourceEnvironmentReferencesMetaData getResourceEnvironmentReferences()
    {
-      return jndiEnvironmentRefsGroup.getResourceEnvironmentReferences();
+      ResourceEnvironmentReferencesMetaData refs = null;
+      if(jndiEnvironmentRefsGroup != null)
+         refs = jndiEnvironmentRefsGroup.getResourceEnvironmentReferences();
+      return refs;
    }
 
    public ResourceReferenceMetaData getResourceReferenceByName(String name)
@@ -983,7 +1010,10 @@
    @XmlTransient
    public ResourceReferencesMetaData getResourceReferences()
    {
-      return jndiEnvironmentRefsGroup.getResourceReferences();
+      ResourceReferencesMetaData refs = null;
+      if(jndiEnvironmentRefsGroup != null)
+         refs = jndiEnvironmentRefsGroup.getResourceReferences();
+      return refs;
    }
 
    public ServiceReferenceMetaData getServiceReferenceByName(String name)
@@ -994,7 +1024,10 @@
    @XmlTransient
    public ServiceReferencesMetaData getServiceReferences()
    {
-      return jndiEnvironmentRefsGroup.getServiceReferences();
+      ServiceReferencesMetaData refs = null;
+      if(jndiEnvironmentRefsGroup != null)
+         refs = jndiEnvironmentRefsGroup.getServiceReferences();
+      return refs;
    }
 
    /**