[jboss-cvs] JBossAS SVN: r109141 - in projects/cluster/ha-server-cache-ispn/trunk/src: test/java/org/jboss/web/tomcat/service/session/distributedcache/ispn and 1 other directory.

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

Author: pferraro
Date: 2010-11-05 01:29:06 -0400 (Fri, 05 Nov 2010)
New Revision: 109141

Modified:
   projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DistributedCacheManager.java
   projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DistributedCacheManagerTest.java
Log:
JVM route cache may not necessarily share cache container with session cache.

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DistributedCacheManager.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DistributedCacheManager.java	2010-11-05 03:10:31 UTC (rev 109140)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DistributedCacheManager.java	2010-11-05 05:29:06 UTC (rev 109141)
@@ -139,15 +139,17 @@
       
       if (this.viewChangeListener != null)
       {
-         EmbeddedCacheManager container = (EmbeddedCacheManager) this.sessionCache.getCacheManager();
+         Cache<Address, String> jvmRouteCache = getJvmRouteCache(this.sessionCache.getCacheManager(), this.manager);
          
+         EmbeddedCacheManager container = (EmbeddedCacheManager) jvmRouteCache.getCacheManager();
+         
          container.addListener(this.viewChangeListener);
          
          String jvmRoute = this.manager.getJvmRoute();
          
          if (jvmRoute != null)
          {
-            getJvmRouteCache(container, this.manager).putIfAbsent(container.getAddress(), jvmRoute);
+            jvmRouteCache.putIfAbsent(container.getAddress(), jvmRoute);
          }
       }
    }
@@ -404,9 +406,9 @@
    {
       Map<String, String> result = new HashMap<String, String>();
 
-      for (Object key: this.sessionCache.keySet())
+      for (String key: this.sessionCache.keySet())
       {
-         result.put((String) key, null);
+         result.put(key, null);
       }
       
       return result;

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DistributedCacheManagerTest.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DistributedCacheManagerTest.java	2010-11-05 03:10:31 UTC (rev 109140)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DistributedCacheManagerTest.java	2010-11-05 05:29:06 UTC (rev 109141)
@@ -35,6 +35,7 @@
 import org.infinispan.context.Flag;
 import org.infinispan.distribution.DistributionManager;
 import org.infinispan.lifecycle.ComponentStatus;
+import org.infinispan.manager.CacheContainer;
 import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.notifications.cachelistener.event.CacheEntryActivatedEvent;
 import org.infinispan.notifications.cachelistener.event.CacheEntryModifiedEvent;
@@ -105,7 +106,8 @@
    
    private void start(ComponentStatus status, boolean startCache)
    {
-      EmbeddedCacheManager container = this.control.createMock(EmbeddedCacheManager.class);
+      CacheContainer container = this.control.createMock(CacheContainer.class);
+      EmbeddedCacheManager manager = this.control.createMock(EmbeddedCacheManager.class);
       @SuppressWarnings("unchecked")
       Cache<Address, String> cache = this.control.createMock(Cache.class);
       Address address = this.control.createMock(Address.class);
@@ -121,14 +123,15 @@
       this.sessionCache.addListener(EasyMock.same(this.manager));
       
       EasyMock.expect(this.sessionCache.getCacheManager()).andReturn(container);
+      EasyMock.expect(container.<Address, String>getCache("engine")).andReturn(cache);
+      EasyMock.expect(cache.getCacheManager()).andReturn(manager);
       
 //      container.addListener(EasyMock.same(this.manager));
-      container.addListener(EasyMock.anyObject());
+      manager.addListener(EasyMock.anyObject());
       
-      EasyMock.expect(container.getAddress()).andReturn(address);
+      EasyMock.expect(manager.getAddress()).andReturn(address);
       EasyMock.expect(this.sessionManager.getJvmRoute()).andReturn(jvmRoute);
       EasyMock.expect(this.sessionManager.getEngineName()).andReturn("engine");
-      EasyMock.expect(container.<Address, String>getCache("engine")).andReturn(cache);
       EasyMock.expect(cache.putIfAbsent(EasyMock.same(address), EasyMock.same(jvmRoute))).andReturn(null);
       
       this.control.replay();