[jboss-cvs] JBossAS SVN: r111314 - projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn.

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

Author: pferraro
Date: 2011-05-09 14:55:00 -0400 (Mon, 09 May 2011)
New Revision: 111314

Modified:
   projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DistributedCacheManager.java
Log:
Fix use of deprecated code.

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	2011-05-09 15:28:10 UTC (rev 111313)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DistributedCacheManager.java	2011-05-09 18:55:00 UTC (rev 111314)
@@ -34,6 +34,7 @@
 import org.infinispan.config.CacheLoaderManagerConfig;
 import org.infinispan.config.Configuration;
 import org.infinispan.context.Flag;
+import org.infinispan.distribution.DataLocality;
 import org.infinispan.distribution.DistributionManager;
 import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.notifications.Listener;
@@ -474,7 +475,11 @@
    {
       DistributionManager manager = this.sessionCache.getAdvancedCache().getDistributionManager();
       
-      return (manager != null) ? manager.isLocal(sessionId) : true;
+      if (manager == null) return true;
+      
+      DataLocality locality = manager.getLocality(sessionId);
+      
+      return locality.isLocal() || locality.isUncertain();
    }
 
    /**