Author: remm
Date: Thu Mar 16 06:13:00 2006
New Revision: 386336
URL: http://svn.apache.org/viewcvs?rev=386336&view=rev
Log:
- Wrap remove inside a try/catch, to prevent recurrent undeploy failures.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/HostConfig.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/HostConfig.java?rev=386336&r1=386335&r2=386336&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/HostConfig.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/HostConfig.java
Thu Mar 16 06:13:00 2006
@@ -975,12 +975,17 @@
if (log.isInfoEnabled())
log.info(sm.getString("hostConfig.undeploy",
app.name));
ContainerBase context = (ContainerBase)
host.findChild(app.name);
- host.removeChild(context);
+ try {
+ host.removeChild(context);
+ } catch (Throwable t) {
+ log.warn(sm.getString
+ ("hostConfig.context.remove", app.name), t);
+ }
try {
context.destroy();
- } catch (Exception e) {
+ } catch (Throwable t) {
log.warn(sm.getString
- ("hostConfig.context.destroy", app.name), e);
+ ("hostConfig.context.destroy", app.name), t);
}
// Delete other redeploy resources
for (int j = i + 1; j < resources.length; j++) {
@@ -1010,12 +1015,17 @@
if (log.isInfoEnabled())
log.info(sm.getString("hostConfig.undeploy", app.name));
ContainerBase context = (ContainerBase)
host.findChild(app.name);
- host.removeChild(context);
+ try {
+ host.removeChild(context);
+ } catch (Throwable t) {
+ log.warn(sm.getString
+ ("hostConfig.context.remove", app.name), t);
+ }
try {
context.destroy();
- } catch (Exception e) {
+ } catch (Throwable t) {
log.warn(sm.getString
- ("hostConfig.context.destroy", app.name), e);
+ ("hostConfig.context.destroy", app.name), t);
}
// Delete all redeploy resources
for (int j = i + 1; j < resources.length; j++) {
@@ -1150,7 +1160,12 @@
DeployedApplication[] apps =
(DeployedApplication[]) deployed.values().toArray(new
DeployedApplication[0]);
for (int i = 0; i < apps.length; i++) {
- host.removeChild(host.findChild(apps[i].name));
+ try {
+ host.removeChild(host.findChild(apps[i].name));
+ } catch (Throwable t) {
+ log.warn(sm.getString
+ ("hostConfig.context.remove", apps[i].name), t);
+ }
}
deployed.clear();
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties?rev=386336&r1=386335&r2=386336&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
Thu Mar 16 06:13:00 2006
@@ -43,6 +43,7 @@
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.deploy=Deploying web application directory {0}
hostConfig.deployDescriptor=Deploying configuration descriptor {0}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
