This is an automated email from the ASF dual-hosted git repository.
rmaucher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 4e462603c1 Harmonize with war and directory deploy
4e462603c1 is described below
commit 4e462603c135d9a90a38eafca321393fefc35c6b
Author: remm <[email protected]>
AuthorDate: Wed May 20 16:11:54 2026 +0200
Harmonize with war and directory deploy
Descriptor deployment does not add to the deployed map on failure,
unlike the two others.
---
java/org/apache/catalina/startup/HostConfig.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/startup/HostConfig.java
b/java/org/apache/catalina/startup/HostConfig.java
index 2670b33f1a..47d5279818 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -691,9 +691,7 @@ public class HostConfig implements LifecycleListener {
addGlobalRedeployResources(deployedApp);
}
- if (host.findChild(context.getName()) != null) {
- deployed.put(context.getName(), deployedApp);
- }
+ deployed.put(context.getName(), deployedApp);
if (log.isInfoEnabled()) {
log.info(sm.getString("hostConfig.deployDescriptor.finished",
contextXml.getAbsolutePath(),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
