This is an automated email from the ASF dual-hosted git repository.

rmaucher pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
     new df2d526e36 Harmonize with war and directory deploy
df2d526e36 is described below

commit df2d526e3611723383be8beaa55ec41cf7182639
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 55556c81a8..741a287e98 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -730,9 +730,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]

Reply via email to