[jboss-cvs] JBossAS SVN: r65253 - trunk/server/src/main/org/jboss/metadata.

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

Author: bstansberry at jboss.com
Date: 2007-09-08 14:42:21 -0400 (Sat, 08 Sep 2007)
New Revision: 65253

Modified:
   trunk/server/src/main/org/jboss/metadata/EntityMetaData.java
Log:
[JBAS-4692] Avoid NPE if jboss.xml doesn't have "cache-invalidation-config" element.

Modified: trunk/server/src/main/org/jboss/metadata/EntityMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/EntityMetaData.java	2007-09-08 18:41:35 UTC (rev 65252)
+++ trunk/server/src/main/org/jboss/metadata/EntityMetaData.java	2007-09-08 18:42:21 UTC (rev 65253)
@@ -123,6 +123,14 @@
 
    public CacheInvalidationConfigMetaData getCacheInvalidConfig()
    {
+      if (cacheInvalidConfig == null)
+      {
+         cacheInvalidConfig = new CacheInvalidationConfigMetaData();
+      } 
+      if (this.cacheInvalidConfig.getInvalidationGroupName() == null)
+      {
+          cacheInvalidConfig.setInvalidationGroupName(getEjbName());
+      }
       return cacheInvalidConfig;
    }
 
@@ -273,7 +281,7 @@
 
    public CacheInvalidationConfigMetaData getDistributedCacheInvalidationConfig ()
    {
-      return this.cacheInvalidConfig ;
+      return getCacheInvalidConfig();
    }
 
    public void importEjbJarXml( Element element )