From e1315feaf48f3f224ff65a4e857618cb40d65266 Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 24 Nov 2010 17:36:28 +0000 Subject: [PATCH] host.removeChild() already calls context.destroy(). Don't call it twice. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1038713 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/startup/HostConfig.java | 14 -------------- java/org/apache/catalina/startup/LocalStrings.properties | 1 - .../org/apache/catalina/startup/LocalStrings_es.properties | 1 - 3 files changed, 16 deletions(-) diff --git a/java/org/apache/catalina/startup/HostConfig.java b/java/org/apache/catalina/startup/HostConfig.java index 6df1c2edb..cb4bce701 100644 --- a/java/org/apache/catalina/startup/HostConfig.java +++ b/java/org/apache/catalina/startup/HostConfig.java @@ -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 { diff --git a/java/org/apache/catalina/startup/LocalStrings.properties b/java/org/apache/catalina/startup/LocalStrings.properties index 8898e1d58..67a5b8ad7 100644 --- a/java/org/apache/catalina/startup/LocalStrings.properties +++ b/java/org/apache/catalina/startup/LocalStrings.properties @@ -72,7 +72,6 @@ expandWar.illegalPath=The archive [{0}] is malformed and will be ignored: an ent 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} diff --git a/java/org/apache/catalina/startup/LocalStrings_es.properties b/java/org/apache/catalina/startup/LocalStrings_es.properties index 284634ef0..f464dec22 100644 --- a/java/org/apache/catalina/startup/LocalStrings_es.properties +++ b/java/org/apache/catalina/startup/LocalStrings_es.properties @@ -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 -- 2.11.0