tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject [tomcat] branch 8.5.x updated: Fix a possible race condition
Date Mon, 04 Nov 2019 17:10:57 GMT
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 2ab75fb  Fix a possible race condition
2ab75fb is described below

commit 2ab75fb08b5234e7d14739c946752944257c3775
Author: Mark Thomas <markt@apache.org>
AuthorDate: Mon Nov 4 17:09:59 2019 +0000

    Fix a possible race condition
---
 java/org/apache/jasper/JspCompilationContext.java | 4 +++-
 webapps/docs/changelog.xml                        | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/jasper/JspCompilationContext.java b/java/org/apache/jasper/JspCompilationContext.java
index c1ccee1..cb38a07 100644
--- a/java/org/apache/jasper/JspCompilationContext.java
+++ b/java/org/apache/jasper/JspCompilationContext.java
@@ -82,7 +82,9 @@ public class JspCompilationContext {
 
     private volatile boolean removed = false;
 
-    private URLClassLoader jspLoader;
+    // volatile so changes are visible when multiple threads request a JSP file
+    // that has been modified
+    private volatile URLClassLoader jspLoader;
     private URL baseUrl;
     private Class<?> servletClass;
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 18d35cc..415510d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -114,6 +114,10 @@
         condition if the JSP is modified during compilation. Patch provided by
         Karl von Randow. (markt)
       </fix>
+      <fix>
+        Fix a race condition that could mean changes to a modified JSP were not
+        visible to end users. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Web applications">


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message