Don't add HostConfig as a listener twice. It breaks the Manager app and probably...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@947397 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/StandardHost.java b/java/org/apache/catalina/core/StandardHost.java
index 6e34295..1973492 100644 (file)
--- a/java/org/apache/catalina/core/StandardHost.java
+++ b/java/org/apache/catalina/core/StandardHost.java
@@ -33,7 +33,6 @@ import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.Valve;
 import org.apache.catalina.loader.WebappClassLoader;
 import org.apache.catalina.mbeans.MBeanUtils;
-import org.apache.catalina.startup.HostConfig;
 import org.apache.catalina.util.LifecycleBase;
 import org.apache.catalina.valves.ValveBase;
 
@@ -802,16 +801,6 @@ public class StandardHost extends ContainerBase implements Host {
     }
 
     @Override
-    protected void initInternal() throws LifecycleException {
-
-        super.initInternal();
-
-        HostConfig deployer = new HostConfig();
-        addLifecycleListener(deployer);                
-    }
-
-    
-    @Override
     protected String getObjectNameKeyProperties() {
 
         StringBuilder keyProperties = new StringBuilder("type=Host");

diff --git a/test/org/apache/catalina/mbeans/TestRegistration.java b/test/org/apache/catalina/mbeans/TestRegistration.java
index b2c031a..99fcb6f 100644 (file)
--- a/test/org/apache/catalina/mbeans/TestRegistration.java
+++ b/test/org/apache/catalina/mbeans/TestRegistration.java
@@ -56,7 +56,7 @@ public class TestRegistration extends TomcatBaseTest {
 
         // Verify there are some Tomcat MBeans
         onames = mbeanServer.queryNames(new ObjectName("Tomcat:*"), null);
-        assertTrue("Not enough Tomcat MBeans", onames.size() >= 21);
+        assertTrue("Not enough Tomcat MBeans", onames.size() >= 20);
 
         tomcat.stop();