[jboss-cvs] JBossAS SVN: r73125 - branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree.

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

Author: bstansberry at jboss.com
Date: 2008-05-07 17:59:24 -0400 (Wed, 07 May 2008)
New Revision: 73125

Modified:
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
Log:
[EJBTHREE-1136] Sync from the EAP branch

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java	2008-05-07 21:44:31 UTC (rev 73124)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java	2008-05-07 21:59:24 UTC (rev 73125)
@@ -323,7 +323,18 @@
       cleanBeanRegion();
       
       cache.registerClassLoader(cacheNode.toString(), cl);
-      cache.activateRegion(cacheNode.toString());
+      try
+      {
+         cache.activateRegion(cacheNode.toString());
+      }
+      catch (RegionNotEmptyException e)
+      {
+         // this can happen with nested bean contexts if gravitation
+         // pulls a parent bean over after the parent region is stopped
+         // Clean up and try again
+         cleanBeanRegion();
+         cache.activateRegion(cacheNode.toString());
+      }
       
       log.debug("initialize(): create eviction region: " +region + " for ejb: " +this.ejbContainer.getEjbName());