This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 82cf2d0 Follow on to 2b0aaedd
82cf2d0 is described below
commit 82cf2d0c4d72cc56f5e74f17f1b34c7ac8f70824
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Nov 7 18:55:39 2019 +0000
Follow on to 2b0aaedd
---
java/org/apache/catalina/webresources/CachedResource.java | 2 +-
java/org/apache/catalina/webresources/StandardRoot.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/webresources/CachedResource.java
b/java/org/apache/catalina/webresources/CachedResource.java
index 72dba84..b1caf07 100644
--- a/java/org/apache/catalina/webresources/CachedResource.java
+++ b/java/org/apache/catalina/webresources/CachedResource.java
@@ -476,7 +476,7 @@ public class CachedResource implements WebResource {
}
private WebResource getResource() {
- return root.getResourceInternal(webAppPath,
usesClassLoaderResources);
+ return root.getResource(webAppPath, false,
usesClassLoaderResources);
}
}
}
diff --git a/java/org/apache/catalina/webresources/StandardRoot.java
b/java/org/apache/catalina/webresources/StandardRoot.java
index cd4e67c..444bc81 100644
--- a/java/org/apache/catalina/webresources/StandardRoot.java
+++ b/java/org/apache/catalina/webresources/StandardRoot.java
@@ -206,7 +206,7 @@ public class StandardRoot extends LifecycleMBeanBase
implements WebResourceRoot
return getResource(path, true, false);
}
- private WebResource getResource(String path, boolean validate,
+ protected WebResource getResource(String path, boolean validate,
boolean useClassLoaderResources) {
if (validate) {
path = validate(path);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
