You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/11/07 18:56:05 UTC
[tomcat] branch master updated: Follow on to 03e7bc84
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new b12f3b1 Follow on to 03e7bc84
b12f3b1 is described below
commit b12f3b1bf09ecbd7d3633ac4dc29d6b18a37c2ab
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Nov 7 18:55:39 2019 +0000
Follow on to 03e7bc84
---
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 0f5058e..21fa063 100644
--- a/java/org/apache/catalina/webresources/StandardRoot.java
+++ b/java/org/apache/catalina/webresources/StandardRoot.java
@@ -207,7 +207,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: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org