[jboss-cvs] JBossAS SVN: r67532 - in branches/JBPAPP_4_2/ejb3: src/main/org/jboss/ejb3/cache/tree and 1 other directories.

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

Author: bstansberry at jboss.com
Date: 2007-11-27 21:51:58 -0500 (Tue, 27 Nov 2007)
New Revision: 67532

Added:
   branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1136/
Modified:
   branches/JBPAPP_4_2/ejb3/build-test.xml
   branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
Log:
[JBPAPP-453] StatefulTreeCache initialize must clear the cache region

Modified: branches/JBPAPP_4_2/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/build-test.xml	2007-11-28 02:48:46 UTC (rev 67531)
+++ branches/JBPAPP_4_2/ejb3/build-test.xml	2007-11-28 02:51:58 UTC (rev 67532)
@@ -3364,6 +3364,20 @@
 	        <include name="testlocal-service.xml"/>
 	     </fileset>
 	  </copy>
+
+    <jar jarfile="${build.lib}/ejbthree1136.jar">
+      <fileset dir="${build.classes}">
+          <include name="org/jboss/ejb3/test/ejbthree1136/DoNothing*.class"/>
+       </fileset>
+    </jar>
+    <jar destfile="${build.lib}/ejbthree1136.sar">
+       <metainf dir="${build.resources}/test/ejbthree1136">
+          <include name="jboss-service.xml"/>
+       </metainf>
+       <fileset dir="${build.classes}">
+          <include name="org/jboss/ejb3/test/ejbthree1136/SFSB*.class"/>
+       </fileset>
+    </jar>
    </target>
    
    <target name="jars" depends="removedislocal, statelesscreation, defaultremotebindings, localfromremote, clusteredjms, entityoptimisticlocking, concurrentnaming, propertyreplacement, persistenceunits, invalidtxmdb, descriptortypo, libdeployment, homeinterface, servicexmbean, arjuna, mdbtransactions, unauthenticatedprincipal, clusteredservice, invoker, classloader, 
@@ -4227,11 +4241,18 @@
 	             value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=n,suspend=n"/>
 	      -->
 	   </antcall>
+	   
 	   <antcall target="test-with-jvmargs" inheritRefs="true">
 	      <param name="test" value="ejbthree921"/>
 	      <param name="jvmargs" value=""/>
 	      <param name="test.extension" value="${buddy-replication-extension}"/> 
 	   </antcall>
+	   
+      <antcall target="test-with-jvmargs" inheritRefs="true">
+         <param name="test" value="ejbthree1136"/>
+         <param name="jvmargs" value=""/>
+         <param name="test.extension" value="${buddy-replication-extension}"/> 
+      </antcall>
 
    </target>
 	

Modified: branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java	2007-11-28 02:48:46 UTC (rev 67531)
+++ branches/JBPAPP_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java	2007-11-28 02:51:58 UTC (rev 67532)
@@ -319,19 +319,11 @@
               config.maxSize());
       Region region = evictRegionManager.createRegion(cacheNode, element);
       
+      // JBCACHE-1136.  There's no reason to have state in an inactive region
+      cleanBeanRegion();
+      
       cache.registerClassLoader(cacheNode.toString(), cl);
-      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());
-      }
+      cache.activateRegion(cacheNode.toString());
       
       log.debug("initialize(): create eviction region: " +region + " for ejb: " +this.ejbContainer.getEjbName());
    

Copied: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1136 (from rev 67525, branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1136)