[jboss-cvs] JBossAS SVN: r72697 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/sso.

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

Author: bstansberry at jboss.com
Date: 2008-04-24 15:37:28 -0400 (Thu, 24 Apr 2008)
New Revision: 72697

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/sso/TreeCacheSSOClusterManager.java
Log:
[JBAS-5380] Use CacheManager, not PojoCacheManager

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/sso/TreeCacheSSOClusterManager.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/sso/TreeCacheSSOClusterManager.java	2008-04-24 19:36:32 UTC (rev 72696)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/sso/TreeCacheSSOClusterManager.java	2008-04-24 19:37:28 UTC (rev 72697)
@@ -42,6 +42,7 @@
 import org.apache.catalina.Session;
 import org.apache.catalina.util.LifecycleSupport;
 import org.jboss.cache.Cache;
+import org.jboss.cache.CacheManager;
 import org.jboss.cache.CacheStatus;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
@@ -58,8 +59,7 @@
 import org.jboss.cache.notifications.event.NodeRemovedEvent;
 import org.jboss.cache.notifications.event.ViewChangedEvent;
 import org.jboss.cache.pojo.PojoCache;
-import org.jboss.ha.cachemanager.CacheManagerLocator;
-import org.jboss.ha.cachemanager.PojoCacheManager;
+import org.jboss.ha.framework.server.CacheManagerLocator;
 import org.jboss.logging.Logger;
 import org.jboss.mx.util.MBeanServerLocator;
 import org.jboss.util.NestedRuntimeException;
@@ -1187,8 +1187,8 @@
          {       
             try
             {
-               PojoCacheManager pcm = CacheManagerLocator.getCacheManagerLocator().getCacheManager(null);
-               available = pcm.getConfigurationNames().contains(cacheName);
+               CacheManager cm = CacheManagerLocator.getCacheManagerLocator().getCacheManager(null);
+               available = cm.getConfigurationNames().contains(cacheName);
             }
             catch (IllegalStateException ise)
             {
@@ -1269,18 +1269,12 @@
          ContextClassLoaderSwitcher switcher = (ContextClassLoaderSwitcher) AccessController.doPrivileged(ContextClassLoaderSwitcher.INSTANTIATOR);
          ContextClassLoaderSwitcher.SwitchContext switchContext = switcher.getSwitchContext(getClass().getClassLoader());
          try
-         {// Determine if our cache is a PojoCache or a plain Cache
+         {
+            // Determine if our cache is a PojoCache or a plain Cache
             if (cacheObjectName == null)
             {
-               PojoCacheManager pcm = CacheManagerLocator.getCacheManagerLocator().getCacheManager(null);
-               if (pcm.getPojoCacheNames().contains(cacheName))
-               {
-                  cache = pcm.getPojoCache(cacheName, true).getCache();
-               }
-               else
-               {
-                  cache = pcm.getCache(cacheName, true);
-               }
+               CacheManager cm = CacheManagerLocator.getCacheManagerLocator().getCacheManager(null);
+               cache = cm.getCache(cacheName, true);               
             }
             else if (server != null)
             {