Author: markt
Date: Fri Feb 1 21:23:31 2019
New Revision: 1852774
URL: http://svn.apache.org/viewvc?rev=1852774&view=rev
Log:
If the resources for a web application have been configured with multiple
locations mapped to /WEB-INF/classes, ensure that all of those locations are
used when building the web application class path.
Patch provided by Marcin Gołębski.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1852774&r1=1852773&r2=1852774&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Fri
Feb 1 21:23:31 2019
@@ -1519,9 +1519,11 @@ public abstract class WebappClassLoaderB
state = LifecycleState.STARTING_PREP;
- WebResource classes = resources.getResource("/WEB-INF/classes");
- if (classes.isDirectory() && classes.canRead()) {
- localRepositories.add(classes.getURL());
+ WebResource[] classesResources =
resources.getResources("/WEB-INF/classes");
+ for (WebResource classes : classesResources) {
+ if (classes.isDirectory() && classes.canRead()) {
+ localRepositories.add(classes.getURL());
+ }
}
WebResource[] jars = resources.listResources("/WEB-INF/lib");
for (WebResource jar : jars) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1852774&r1=1852773&r2=1852774&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Feb 1 21:23:31 2019
@@ -137,6 +137,13 @@
<update>
Update the recommended minimum Tomcat Native version to 1.2.21. (markt)
</update>
+ <fix>
+ <bug>63137</bug>: If the resources for a web application have been
+ configured with multiple locations mapped to
+ <code>/WEB-INF/classes</code>, ensure that all of those locations are
+ used when building the web application class path. Patch provided by
+ Marcin GoÅÄbski. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
