[jboss-cvs] JBossAS SVN: r65510 - branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session.

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

Author: bstansberry at jboss.com
Date: 2007-09-20 17:05:41 -0400 (Thu, 20 Sep 2007)
New Revision: 65510

Modified:
   branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheCluster.java
Log:
[JBAS-4623] Don't set 'jboss' server if it's already there

Modified: branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheCluster.java
===================================================================
--- branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheCluster.java	2007-09-20 20:09:57 UTC (rev 65509)
+++ branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheCluster.java	2007-09-20 21:05:41 UTC (rev 65510)
@@ -668,7 +668,16 @@
       {         
          // Tell the JBoss MBeanServerLocator utility 
          // that Tomcat's MBean server is 'jboss'
-         MBeanServerLocator.setJBoss(getMBeanServer());
+         // JBAS-4623 Only do this if there isn't already a 'jboss' server
+         try
+         {
+            MBeanServerLocator.locateJBoss();
+         }
+         catch (IllegalStateException ise)
+         {
+            // This is the expected condition when running in standalone Tomcat
+            MBeanServerLocator.setJBoss(getMBeanServer());
+         }
          
          // Initialize the tree cache
          PojoCacheMBean cache = getTreeCache();
@@ -883,15 +892,15 @@
             name += ",engine=" + container.getName();
          }
          
-         ObjectName clusterName = new ObjectName(domain + name);
+         ObjectName objName = new ObjectName(domain + name);
 
-         if (server.isRegistered(clusterName))
+         if (server.isRegistered(objName))
          {
-            log.warn("MBean " + clusterName + " already registered");
+            log.warn("MBean " + objName + " already registered");
          }
          else
          {
-            this.objectName = clusterName;
+            this.objectName = objName;
             server.registerMBean(this, objectName);
          }