Author: fhanik Date: Mon Sep 18 11:47:54 2006 New Revision: 447499 URL: http://svn.apache.org/viewvc?view=rev&rev=447499 Log: Fixed defects 40449 and 39125, shout if you disagree. This seemed the simplest and most correct way to do it.
Modified: tomcat/container/tc5.5.x/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HostManagerServlet.java Modified: tomcat/container/tc5.5.x/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HostManagerServlet.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HostManagerServlet.java?view=diff&rev=447499&r1=447498&r2=447499 ============================================================================== --- tomcat/container/tc5.5.x/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HostManagerServlet.java (original) +++ tomcat/container/tc5.5.x/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HostManagerServlet.java Mon Sep 18 11:47:54 2006 @@ -45,6 +45,7 @@ import org.apache.catalina.startup.HostConfig; import org.apache.catalina.util.StringManager; import org.apache.commons.modeler.Registry; +import org.apache.catalina.core.ContainerBase; /** @@ -444,7 +445,7 @@ // Add host aliases if ((aliases != null) && !("".equals(aliases))) { - StringTokenizer tok = new StringTokenizer(aliases, ","); + StringTokenizer tok = new StringTokenizer(aliases, ", "); while (tok.hasMoreTokens()) { host.addAlias(tok.nextToken()); } @@ -511,7 +512,9 @@ // Remove host // Note that the host will not get physically removed try { - engine.removeChild(engine.findChild(name)); + Container child = engine.findChild(name); + engine.removeChild(child); + if ( child instanceof ContainerBase ) ((ContainerBase)child).destroy(); } catch (Exception e) { writer.println(sm.getString("hostManagerServlet.exception", e.toString())); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]