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

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

Author: bstansberry at jboss.com
Date: 2008-08-25 11:10:56 -0400 (Mon, 25 Aug 2008)
New Revision: 77438

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheCluster.java
Log:
Get MBeanServer via Tomcat mechanism

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheCluster.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheCluster.java	2008-08-25 15:08:31 UTC (rev 77437)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheCluster.java	2008-08-25 15:10:56 UTC (rev 77438)
@@ -25,10 +25,8 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URL;
-import java.util.ArrayList;
 
 import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
 import javax.management.ObjectName;
 
 import org.apache.catalina.Container;
@@ -42,6 +40,7 @@
 import org.apache.catalina.util.LifecycleSupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.tomcat.util.modeler.Registry;
 import org.jboss.cache.config.Configuration;
 import org.jboss.cache.pojo.PojoCacheFactory;
 import org.jboss.cache.pojo.jmx.PojoCacheJmxWrapper;
@@ -942,15 +941,7 @@
    {
       if (mserver == null)
       {
-         ArrayList servers = MBeanServerFactory.findMBeanServer(null);
-         if (servers.size() > 0)
-         {
-            mserver = (MBeanServer) servers.get(0);
-         }
-         else
-         {
-            mserver = MBeanServerFactory.createMBeanServer();
-         }
+         mserver = Registry.getRegistry(null, null).getMBeanServer();
       }
       return mserver;
    }