remm 2005/01/03 08:10:19
Modified: catalina/src/share/org/apache/catalina/startup
HostConfig.java LocalStrings.properties
Log:
- 32771: Cannot undeploy/deploy misconfigured app after tomcat startup.
- Submitted by Gabriele Garuglieri.
Revision Changes Path
1.52 +5 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java
Index: HostConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- HostConfig.java 1 Dec 2004 11:06:22 -0000 1.51
+++ HostConfig.java 3 Jan 2005 16:10:19 -0000 1.52
@@ -554,8 +554,8 @@
// Assume this is a configuration descriptor and deploy it
log.debug(sm.getString("hostConfig.deployDescriptor", file));
+ Context context = null;
try {
- Context context = null;
synchronized (digester) {
try {
context = (Context) digester.parse(contextXml);
@@ -654,7 +654,9 @@
file), t);
}
- deployed.put(contextPath, deployedApp);
+ if (context != null && host.findChild(context.getName()) != null) {
+ deployed.put(contextPath, deployedApp);
+ }
}
1.11 +4 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- LocalStrings.properties 1 Dec 2004 11:06:22 -0000 1.10
+++ LocalStrings.properties 3 Jan 2005 16:10:19 -0000 1.11
@@ -16,6 +16,8 @@
contextConfig.defaultMissing=Missing default web.xml, using application
web.xml only
contextConfig.defaultParse=Parse error in default web.xml
contextConfig.defaultPosition=Occurred at line {0} column {1}
+contextConfig.fixDocBase=Exception fixing docBase: {0}
+contextConfig.init=ContextConfig: Initializing
contextConfig.missingRealm=No Realm has been configured to authenticate
against
contextConfig.role.auth=WARNING: Security role name {0} used in an
<auth-constraint> without being defined in a <security-role>
contextConfig.role.link=WARNING: Security role name {0} used in a
<role-link> without being defined in a <security-role>
@@ -57,7 +59,8 @@
hostConfig.reload=Reloading context [{0}]
hostConfig.removeXML=Context [{0}] is undeployed
hostConfig.removeDIR=Directory {0} is undeployed
-hostConfig.removeWAR=War {0} is undeployedhostConfig.start=HostConfig:
Processing START
+hostConfig.removeWAR=War {0} is undeployed
+hostConfig.start=HostConfig: Processing START
hostConfig.stop=HostConfig: Processing STOP
hostConfig.undeploy=Undeploying web application at context path {0}
hostConfig.undeploy.error=Error undeploying web application at context path
{0}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
