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

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

Author: bstansberry at jboss.com
Date: 2010-03-04 23:18:36 -0500 (Thu, 04 Mar 2010)
New Revision: 101929

Modified:
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossManager.java
Log:
[JBAS-7785] Conform root war object name to what StandardContext uses

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossManager.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossManager.java	2010-03-05 04:01:14 UTC (rev 101928)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossManager.java	2010-03-05 04:18:36 UTC (rev 101929)
@@ -1135,9 +1135,11 @@
          }
          String hostName = ((Host) container_.getParent()).getName();
          hostName = (hostName == null) ? "localhost" : hostName;
+         String path = ((Context) container_).getPath();
+         path = "".equals(path) ? "/" : path; 
          ObjectName clusterName = new ObjectName(domain
                + ":type=Manager,host=" + hostName + ",path="
-               + ((Context) container_).getPath());
+               + path);
 
          if (server.isRegistered(clusterName))
          {
@@ -1145,9 +1147,8 @@
             return;
          }
 
+         server.registerMBean(this, clusterName);
          objectName_ = clusterName;
-         server.registerMBean(this, clusterName);
-
       }
       catch (Exception ex)
       {