[teiid-commits] teiid SVN: r3491 - in branches/7.1.x: build/kits/jboss-container/deploy/teiid and 1 other directories.

[teiid-commits at lists.jboss.org]

Author: loleary
Date: 2011-09-13 19:22:06 -0400 (Tue, 13 Sep 2011)
New Revision: 3491

Modified:
   branches/7.1.x/build/kits/jboss-container/deploy/teiid/teiid-cache-manager-jboss-beans-rename-me.xml
   branches/7.1.x/cache-jbosscache/src/main/java/org/teiid/cache/jboss/JBossCacheFactory.java
   branches/7.1.x/pom.xml
Log:
TEIID-1493: When a node rejoins the cluster after the initial cache has been populated, during the join time the state has been set to not transfer. This need be set to transfer, also JBoss cache only transfers the state on "active" regions.

Modified: branches/7.1.x/build/kits/jboss-container/deploy/teiid/teiid-cache-manager-jboss-beans-rename-me.xml
===================================================================
--- branches/7.1.x/build/kits/jboss-container/deploy/teiid/teiid-cache-manager-jboss-beans-rename-me.xml	2011-09-13 23:21:52 UTC (rev 3490)
+++ branches/7.1.x/build/kits/jboss-container/deploy/teiid/teiid-cache-manager-jboss-beans-rename-me.xml	2011-09-13 23:22:06 UTC (rev 3491)
@@ -85,7 +85,7 @@
                             <!-- Hibernate 2LC can replicate custom types, so we use marshalling -->
                             <property name="useRegionBasedMarshalling">true</property>
                             <!-- Must match the value of "useRegionBasedMarshalling" -->
-                            <property name="inactiveOnStartup">true</property>
+                            <property name="inactiveOnStartup">false</property>
 
                             <!-- Disable asynchronous RPC marshalling/sending -->
                             <property name="serializationExecutorPoolSize">0</property>

Modified: branches/7.1.x/cache-jbosscache/src/main/java/org/teiid/cache/jboss/JBossCacheFactory.java
===================================================================
--- branches/7.1.x/cache-jbosscache/src/main/java/org/teiid/cache/jboss/JBossCacheFactory.java	2011-09-13 23:21:52 UTC (rev 3490)
+++ branches/7.1.x/cache-jbosscache/src/main/java/org/teiid/cache/jboss/JBossCacheFactory.java	2011-09-13 23:22:06 UTC (rev 3491)
@@ -59,6 +59,7 @@
 			
 			if (!this.cacheStore.getCacheStatus().allowInvocations()) {
 				this.cacheStore.start();
+				this.cacheStore.getRegion(this.cacheStore.getRoot().getFqn(), true).activate();
 			}
 			
 			Node cacheRoot = this.cacheStore.getRoot().addChild(Fqn.fromString("Teiid")); //$NON-NLS-1$
@@ -67,6 +68,7 @@
 			
 			Region cacheRegion = this.cacheStore.getRegion(node.getFqn(), true);
 			cacheRegion.setEvictionRegionConfig(buildEvictionConfig(node.getFqn(), config));
+			cacheRegion.activate();
 						
 			JBossCache jc = null;
 			if (config != null && config.getPolicy().equals(Policy.EXPIRATION)) {

Modified: branches/7.1.x/pom.xml
===================================================================
--- branches/7.1.x/pom.xml	2011-09-13 23:21:52 UTC (rev 3490)
+++ branches/7.1.x/pom.xml	2011-09-13 23:22:06 UTC (rev 3491)
@@ -365,7 +365,7 @@
 			<dependency>
 				<groupId>org.jboss.cache</groupId>
 				<artifactId>jbosscache-core</artifactId>
-				<version>3.1.0.GA</version>
+				<version>3.2.5.GA</version>
                 <exclusions>
                     <exclusion>
                       <groupId>javax.transaction</groupId>