[jboss-cvs] JBossAS SVN: r76139 - branches/JBoss_4_0_5_GA_CP/tomcat/src/main/org/jboss/web/tomcat/tc5.

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

Author: mmoyses
Date: 2008-07-23 12:55:06 -0400 (Wed, 23 Jul 2008)
New Revision: 76139

Modified:
   branches/JBoss_4_0_5_GA_CP/tomcat/src/main/org/jboss/web/tomcat/tc5/TomcatDeployer.java
Log:
ASPATCH-386: changed hard coded "localhost" MBean names

Modified: branches/JBoss_4_0_5_GA_CP/tomcat/src/main/org/jboss/web/tomcat/tc5/TomcatDeployer.java
===================================================================
--- branches/JBoss_4_0_5_GA_CP/tomcat/src/main/org/jboss/web/tomcat/tc5/TomcatDeployer.java	2008-07-23 16:12:06 UTC (rev 76138)
+++ branches/JBoss_4_0_5_GA_CP/tomcat/src/main/org/jboss/web/tomcat/tc5/TomcatDeployer.java	2008-07-23 16:55:06 UTC (rev 76139)
@@ -321,7 +321,7 @@
                jbcm.setSnapshotInterval(snapshotInterval);
             }
 
-            String name = "//" + ((hostName == null) ? "localhost" : hostName) + ctxPath;
+            String name = "//" + defaultHost + ctxPath;
             manager.init(name, metaData, config.isUseJK(), config.isUseLocalCache());
 
             // Don't assign the manager to the context until all config
@@ -422,8 +422,14 @@
       if (server == null)
          return;
 
-      ObjectName objectName = new ObjectName(config.getCatalinaDomain() + ":j2eeType=WebModule,name=//"
-            + ((hostName == null) ? "localhost" : hostName) + ctxPath + ",J2EEApplication=none,J2EEServer=none");
+      String defaultHost = hostName;
+      if (defaultHost == null)
+      {
+         String objName = config.getCatalinaDomain() + ":type=Engine";
+         defaultHost = (String) server.getAttribute(new ObjectName(objName), "defaultHost");
+      }
+      ObjectName objectName = new ObjectName(config.getCatalinaDomain() + ":j2eeType=WebModule,name=//" + defaultHost
+            + ctxPath + ",J2EEApplication=none,J2EEServer=none");
 
       if (server.isRegistered(objectName))
       {