This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 66d6ccf Additional fix for BZ 64191
66d6ccf is described below
commit 66d6ccfe1a0cde856a9fed6d17e03c8707ce1eb3
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Mar 13 16:09:28 2020 +0000
Additional fix for BZ 64191
When embedding a class loader may be used that does not have the
work-around that Tomcat web application class loader has.
---
java/org/apache/catalina/startup/WebappServiceLoader.java | 2 +-
webapps/docs/changelog.xml | 10 ++++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/startup/WebappServiceLoader.java
b/java/org/apache/catalina/startup/WebappServiceLoader.java
index f22e7a8..efdf002 100644
--- a/java/org/apache/catalina/startup/WebappServiceLoader.java
+++ b/java/org/apache/catalina/startup/WebappServiceLoader.java
@@ -108,7 +108,7 @@ public class WebappServiceLoader<T> {
if (orderedLibs == null) {
// No ordered libs, so use every service definition we can find
if (loader instanceof URLClassLoader) {
- Enumeration<URL> resources = ((URLClassLoader)
loader).findResources("/" + configFile);
+ Enumeration<URL> resources = ((URLClassLoader)
loader).findResources(configFile);
while (resources.hasMoreElements()) {
URL resource = resources.nextElement();
parseConfigFile(applicationServicesFound, resource);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a0d9bdc..a36b252 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -60,6 +60,16 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 7.0.103 (violetagg)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>64191</bug>: Make an additional fix for the SCI regression
+ introduced by the fix for <bug>64021</bug> for the case, such as when
+ embedding, when the class loader performing the SCI service lookup is
not
+ the Tomcat web application class loader. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 7.0.102 (violetagg)">
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
