Author: markt
Date: Wed Nov 24 17:36:28 2010
New Revision: 1038713
URL: http://svn.apache.org/viewvc?rev=1038713&view=rev
Log:
host.removeChild() already calls context.destroy(). Don't call it twice.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1038713&r1=1038712&r2=1038713&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Wed Nov 24
17:36:28 2010
@@ -1103,13 +1103,6 @@ public class HostConfig
log.warn(sm.getString
("hostConfig.context.remove", app.name), t);
}
- try {
- context.destroy();
- } catch (Throwable t) {
- ExceptionUtils.handleThrowable(t);
- log.warn(sm.getString
- ("hostConfig.context.destroy", app.name), t);
- }
// Delete other redeploy resources
for (int j = i + 1; j < resources.length; j++) {
try {
@@ -1161,13 +1154,6 @@ public class HostConfig
log.warn(sm.getString
("hostConfig.context.remove", app.name), t);
}
- try {
- context.destroy();
- } catch (Throwable t) {
- ExceptionUtils.handleThrowable(t);
- log.warn(sm.getString
- ("hostConfig.context.destroy", app.name), t);
- }
// Delete all redeploy resources
for (int j = i + 1; j < resources.length; j++) {
try {
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1038713&r1=1038712&r2=1038713&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Wed
Nov 24 17:36:28 2010
@@ -72,7 +72,6 @@ expandWar.illegalPath=The archive [{0}]
hostConfig.appBase=Application base directory {0} does not exist
hostConfig.canonicalizing=Error delete redeploy resources from context [{0}]
hostConfig.cce=Lifecycle event data object {0} is not a Host
-hostConfig.context.destroy=Error during context [{0}] destroy
hostConfig.context.remove=Error while removing context [{0}]
hostConfig.context.restart=Error during context [{0}] restart
hostConfig.createDirs=Unable to create directory for deployment: {0}
Modified:
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties?rev=1038713&r1=1038712&r2=1038713&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
Wed Nov 24 17:36:28 2010
@@ -44,7 +44,6 @@ expandWar.copy = Error copiando {0} a {1
hostConfig.appBase = No existe el directorio base de la aplicaci\u00F3n {0}
hostConfig.canonicalizing = Error al borrar redespliegue de recursos desde
contexto [{0}]
hostConfig.cce = El objeto de los datos de evento de ciclo de vida (Lifecycle
event data object) {0} no es una m\u00E1quina (host)
-hostConfig.context.destroy = Error al destruir contexto [{0}]
hostConfig.context.remove = Error al quitar contexto [{0}]
hostConfig.context.restart = Error durante el arranque del contexto {0}
hostConfig.deploy = Desplieque del directorio {0} de la aplicaci\u00F3n web
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
