This is an automated email from the ASF dual-hosted git repository.
remm 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 31dda0e17f Fix ordering issue creating the classpath
31dda0e17f is described below
commit 31dda0e17f02748c7210280d19f889da16d170be
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 | 6 +++---
webapps/docs/changelog.xml | 4 ++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/loader/WebappLoader.java
b/java/org/apache/catalina/loader/WebappLoader.java
index 00fc04adb1..4c5ed7bd1c 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -318,13 +318,13 @@ public class WebappLoader extends LifecycleMBeanBase
implements Loader {
MigrationUtil.addJakartaEETransformer(classLoader,
getJakartaConverter());
}
- // Configure our repositories
- setClassPath();
-
setPermissions();
classLoader.start();
+ // Configure our repositories
+ setClassPath();
+
String contextName = context.getName();
if (!contextName.startsWith("/")) {
contextName = "/" + contextName;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 321c477213..256df0e26f 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]
