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

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


The following commit(s) were added to refs/heads/11.0.x by this push:
     new 05b0a455f1 Fix ordering issue creating the classpath
05b0a455f1 is described below

commit 05b0a455f13169e27d541ed1cd061a5dd6b7a3b2
Author: remm <[email protected]>
AuthorDate: Thu Nov 13 17:11:44 2025 +0100

    Fix ordering issue creating the classpath
    
    BZ69837 again.
---
 java/org/apache/catalina/loader/WebappLoader.java | 4 ++--
 webapps/docs/changelog.xml                        | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/loader/WebappLoader.java 
b/java/org/apache/catalina/loader/WebappLoader.java
index 95826a216d..680df31133 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -316,11 +316,11 @@ public class WebappLoader extends LifecycleMBeanBase 
implements Loader {
                 MigrationUtil.addJakartaEETransformer(classLoader, 
getJakartaConverter());
             }
 
+            classLoader.start();
+
             // Configure our repositories
             setClassPath();
 
-            classLoader.start();
-
             String contextName = context.getName();
             if (!contextName.startsWith("/")) {
                 contextName = "/" + contextName;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0f186f1672..f2a505dde4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,6 +119,10 @@
         <bug>69877</bug>: Catch IllegalArgumentException when processing URIs
         when creating the classpath to handle invalid URIs. (remm)
       </fix>
+      <fix>
+        Fix populating the classpath with the webapp classloader repositories.
+        (remm)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Clustering">


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to