[jboss-cvs] JBossAS SVN: r67167 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/client and 1 other directory.

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

Author: wolfc
Date: 2007-11-16 05:30:56 -0500 (Fri, 16 Nov 2007)
New Revision: 67167

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/JBossClient5EverythingUnitTestCase.java
Log:
JBAS-4506: Fixed NPE when JBossClientMeta contains no jndiEnvironmentRefsGroup

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java	2007-11-16 10:25:28 UTC (rev 67166)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java	2007-11-16 10:30:56 UTC (rev 67167)
@@ -205,11 +205,15 @@
    }
    public EJBReferenceMetaData getEjbReferenceByName(String name)
    {
+      if(jndiEnvironmentRefsGroup == null)
+         return null;
       return jndiEnvironmentRefsGroup.getEjbReferenceByName(name);
    }
 
    public EJBReferencesMetaData getEjbReferences()
    {
+      if(jndiEnvironmentRefsGroup == null)
+         return null;
       return jndiEnvironmentRefsGroup.getEjbReferences();
    }
    // TODO?
@@ -224,71 +228,99 @@
 
    public EnvironmentEntriesMetaData getEnvironmentEntries()
    {
+      if(jndiEnvironmentRefsGroup == null)
+         return null;
       return jndiEnvironmentRefsGroup.getEnvironmentEntries();
    }
 
    public EnvironmentEntryMetaData getEnvironmentEntryByName(String name)
    {
+      if(jndiEnvironmentRefsGroup == null)
+         return null;
       return jndiEnvironmentRefsGroup.getEnvironmentEntryByName(name);
    }
 
    public MessageDestinationReferenceMetaData getMessageDestinationReferenceByName(String name)
    {
+      if(jndiEnvironmentRefsGroup == null)
+         return null;
       return jndiEnvironmentRefsGroup.getMessageDestinationReferenceByName(name);
    }
 
    public MessageDestinationReferencesMetaData getMessageDestinationReferences()
    {
+      if(jndiEnvironmentRefsGroup == null)
+         return null;
       return jndiEnvironmentRefsGroup.getMessageDestinationReferences();
    }
 
    public PersistenceUnitReferenceMetaData getPersistenceUnitReferenceByName(String name)
    {
+      if(jndiEnvironmentRefsGroup == null)
+         return null;
       return jndiEnvironmentRefsGroup.getPersistenceUnitReferenceByName(name);
    }
 
    public PersistenceUnitReferencesMetaData getPersistenceUnitRefs()
    {
+      if(jndiEnvironmentRefsGroup == null)
+         return null;
       return jndiEnvironmentRefsGroup.getPersistenceUnitRefs();
    }
 
    public LifecycleCallbacksMetaData getPostConstructs()
    {
+      if(jndiEnvironmentRefsGroup == null)
+         return null;
       return jndiEnvironmentRefsGroup.getPostConstructs();
    }
 
    public LifecycleCallbacksMetaData getPreDestroys()
    {
+      if(jndiEnvironmentRefsGroup == null)
+         return null;
       return jndiEnvironmentRefsGroup.getPreDestroys();
    }
 
    public ServiceReferenceMetaData getServiceReferenceByName(String name)
    {
+      if(jndiEnvironmentRefsGroup == null)
+         return null;
       return jndiEnvironmentRefsGroup.getServiceReferenceByName(name);
    }
 
    public ServiceReferencesMetaData getServiceReferences()
    {
+      if(jndiEnvironmentRefsGroup == null)
+         return null;
       return jndiEnvironmentRefsGroup.getServiceReferences();
    }
 
    public ResourceEnvironmentReferenceMetaData getResourceEnvironmentReferenceByName(String name)
    {
+      if(jndiEnvironmentRefsGroup == null)
+         return null;
       return jndiEnvironmentRefsGroup.getResourceEnvironmentReferenceByName(name);
    }
 
    public ResourceEnvironmentReferencesMetaData getResourceEnvironmentReferences()
    {
+      if(jndiEnvironmentRefsGroup == null)
+         return null;
       return jndiEnvironmentRefsGroup.getResourceEnvironmentReferences();
    }
 
    public ResourceReferenceMetaData getResourceReferenceByName(String name)
    {
+      if(jndiEnvironmentRefsGroup == null)
+         return null;
       return jndiEnvironmentRefsGroup.getResourceReferenceByName(name);
    }
 
    public ResourceReferencesMetaData getResourceReferences()
    {
+      if(jndiEnvironmentRefsGroup == null)
+         return null;
       return jndiEnvironmentRefsGroup.getResourceReferences();
    }
 

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/JBossClient5EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/JBossClient5EverythingUnitTestCase.java	2007-11-16 10:25:28 UTC (rev 67166)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/JBossClient5EverythingUnitTestCase.java	2007-11-16 10:30:56 UTC (rev 67167)
@@ -64,6 +64,34 @@
       assertEverything(jbossClientMetaData);
    }
    
+   /**
+    * When there is no jndiEnvironmentRefsGroup we don't want
+    * any NPE to pop up.
+    * @throws Exception
+    */
+   public void testNoJndiEnvironmentRefsGroup() throws Exception
+   {
+      JBossClientMetaData metaData = new JBossClient5MetaData();
+      assertNull(metaData.getJndiEnvironmentRefsGroup());
+      assertNull(metaData.getEjbReferences());
+      assertNull(metaData.getEjbReferenceByName("unknown"));
+      assertNull(metaData.getAnnotatedEjbReferences());
+      assertNull(metaData.getEnvironmentEntries());
+      assertNull(metaData.getEnvironmentEntryByName("unknown"));
+      assertNull(metaData.getMessageDestinationReferences());
+      assertNull(metaData.getMessageDestinationReferenceByName("unknown"));
+      assertNull(metaData.getPersistenceUnitRefs());
+      assertNull(metaData.getPersistenceUnitReferenceByName("unknown"));
+      assertNull(metaData.getPostConstructs());
+      assertNull(metaData.getPreDestroys());
+      assertNull(metaData.getServiceReferences());
+      assertNull(metaData.getServiceReferenceByName("unknown"));
+      assertNull(metaData.getResourceEnvironmentReferences());
+      assertNull(metaData.getResourceEnvironmentReferenceByName("unknown"));
+      assertNull(metaData.getResourceReferences());
+      assertNull(metaData.getResourceReferenceByName("unknown"));
+   }
+   
    protected JBossClient5MetaData unmarshal() throws Exception
    {
       return unmarshal(JBossClient5MetaData.class);