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 1dfb4b77e8 Reformat comment so format is retained when auto-formatting
1dfb4b77e8 is described below
commit 1dfb4b77e8720453961b48246461e13295baf216
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Mar 23 13:59:27 2023 +0000
Reformat comment so format is retained when auto-formatting
---
java/org/apache/catalina/webresources/CachedResource.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/webresources/CachedResource.java
b/java/org/apache/catalina/webresources/CachedResource.java
index 55639a816f..07f479e062 100644
--- a/java/org/apache/catalina/webresources/CachedResource.java
+++ b/java/org/apache/catalina/webresources/CachedResource.java
@@ -316,10 +316,14 @@ public class CachedResource implements WebResource {
/*
* We don't want applications using this URL to access the resource
directly as that could lead to inconsistent
* results when the resource is updated on the file system but the
cache entry has not yet expired. We saw this,
- * for example, in JSP compilation. - last modified time was obtained
via
- *
ServletContext.getResource("path").openConnection().getLastModified() - JSP
content was obtained via
- * ServletContext.getResourceAsStream("path") The result was that the
JSP modification was detected but the JSP
- * content was read from the cache so the non-updated JSP page was
used to generate the .java and .class file
+ * for example, in JSP compilation.
+ *
+ * - last modified time was obtained via
ServletContext.getResource("path").openConnection().getLastModified()
+ *
+ * - JSP content was obtained via
ServletContext.getResourceAsStream("path")
+ *
+ * The result was that the JSP modification was detected but the JSP
content was read from the cache so the
+ * non-updated JSP page was used to generate the .java and .class file
*
* One option to resolve this issue is to use a custom URL scheme for
resource URLs. This would allow us, via
* registration of a URLStreamHandlerFactory, to control how the
resources are accessed and ensure that all
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
