[jboss-cvs] JBossAS SVN: r58823 - branches/Branch_4_0/ejb3/src/main/org/jboss/ejb3/entity

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

Author: bstansberry at jboss.com
Date: 2006-12-04 01:48:46 -0500 (Mon, 04 Dec 2006)
New Revision: 58823

Modified:
   branches/Branch_4_0/ejb3/src/main/org/jboss/ejb3/entity/JBCCache.java
Log:
Disable state transfer for StandardQueryCache region

Modified: branches/Branch_4_0/ejb3/src/main/org/jboss/ejb3/entity/JBCCache.java
===================================================================
--- branches/Branch_4_0/ejb3/src/main/org/jboss/ejb3/entity/JBCCache.java	2006-12-04 06:04:24 UTC (rev 58822)
+++ branches/Branch_4_0/ejb3/src/main/org/jboss/ejb3/entity/JBCCache.java	2006-12-04 06:48:46 UTC (rev 58823)
@@ -46,11 +46,26 @@
 		this.regionFqn = Fqn.fromString( regionName.replace( '.', '/' ) );
 		this.transactionManager = transactionManager;
         if (cache.getUseRegionBasedMarshalling())
-        {
-           // We always activate
-           activateCacheRegion(regionFqn.toString());
+        {           
+           localWritesOnly = StandardQueryCache.class.getName().equals(regionName);
            
-           localWritesOnly = StandardQueryCache.class.getName().equals(regionName);
+           boolean fetchState = cache.getFetchInMemoryState();
+           try
+           {
+              // We don't want a state transfer for the StandardQueryCache,
+              // as it can include classes from multiple scoped classloaders
+              if (localWritesOnly)
+                 cache.setFetchInMemoryState(false);
+              
+              // We always activate
+              activateCacheRegion(regionFqn.toString());
+           }
+           finally
+           {
+              // Restore the normal state transfer setting
+              if (localWritesOnly)
+                 cache.setFetchInMemoryState(fetchState);              
+           }
         }
 	}