geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r947398 - /geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/catalina/core/StandardHost.java
Date Sun, 23 May 2010 11:47:02 GMT
Author: xuhaihong
Date: Sun May 23 11:47:01 2010
New Revision: 947398

URL: http://svn.apache.org/viewvc?rev=947398&view=rev
Log:
Merge changes from Tomcat trunk rev 947397

Modified:
    geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/catalina/core/StandardHost.java

Modified: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/catalina/core/StandardHost.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/catalina/core/StandardHost.java?rev=947398&r1=947397&r2=947398&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/catalina/core/StandardHost.java
(original)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/catalina/core/StandardHost.java
Sun May 23 11:47:01 2010
@@ -33,7 +33,6 @@ import org.apache.catalina.LifecycleList
 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 Contai
     }
 
     @Override
-    protected void initInternal() throws LifecycleException {
-
-        super.initInternal();
-
-        HostConfig deployer = new HostConfig();
-        addLifecycleListener(deployer);                
-    }
-
-    
-    @Override
     protected String getObjectNameKeyProperties() {
 
         StringBuilder keyProperties = new StringBuilder("type=Host");



Mime
View raw message