[jboss-cvs] JBossAS SVN: r72462 - 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-19 21:14:18 -0400 (Sat, 19 Apr 2008)
New Revision: 72462

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/sso/TreeCacheSSOClusterManager.java
Log:
[JBAS-5380] Fix the legacy JMX integration handling

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-19 23:19:42 UTC (rev 72461)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/sso/TreeCacheSSOClusterManager.java	2008-04-20 01:14:18 UTC (rev 72462)
@@ -32,7 +32,6 @@
 import javax.management.MBeanAttributeInfo;
 import javax.management.MBeanInfo;
 import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 import javax.transaction.Status;
 import javax.transaction.TransactionManager;
@@ -102,12 +101,6 @@
    private static final String KEY = "key";
 
    /**
-    * Default global value for the cacheName property
-    */
-   public static final String DEFAULT_GLOBAL_CACHE_NAME =
-      "jboss.cache:service=ClusteredSSOCache";
-
-   /**
     * Default global value for the threadPoolName property
     */
    public static final String DEFAULT_THREAD_POOL_NAME =
@@ -1198,9 +1191,10 @@
             catch (IllegalStateException ise)
             {
                log.debug("No CacheManager available");
+               available = false;
             }
             
-            if (!available && cacheName.indexOf(':') > -1)
+            if (!available && server != null && cacheName.indexOf(':') > -1)
             {
                // See if there is a legacy JMX binding
                String onameStr = cacheName;
@@ -1280,7 +1274,7 @@
                cache = pcm.getCache(cacheName, true);
             }
          }
-         else
+         else if (server != null)
          {            
             // Look in JMX
             MBeanInfo info = server.getMBeanInfo(cacheObjectName);
@@ -1299,6 +1293,11 @@
                }
             }
          }
+         else
+         {
+            // Shouldn't be possible or isTreeCacheAvailable would return false
+            throw new IllegalStateException("No JBoss Cache available under name " + cacheName);
+         }
          
          if (cache.getCacheStatus() != CacheStatus.STARTED)
             cache.start();
@@ -1431,7 +1430,7 @@
    
    private void initThreadPool()
    {      
-      if (threadPoolName != null)
+      if (threadPoolName != null && server != null)
       {
          try
          {