This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 3c7e0e5fae Mark the JSP wrapper for reload after a compilation
3c7e0e5fae is described below
commit 3c7e0e5fae027ae59570431e35d97468fc5c3b24
Author: remm <[email protected]>
AuthorDate: Tue May 20 16:28:30 2025 +0200
Mark the JSP wrapper for reload after a compilation
Previously a failed compilation after a change could lead to a reuse of
the wrapper without reloading it.
BZ69696.
---
java/org/apache/jasper/JspCompilationContext.java | 3 ++-
webapps/docs/changelog.xml | 4 ++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/jasper/JspCompilationContext.java
b/java/org/apache/jasper/JspCompilationContext.java
index dc9f1a2104..116e1c49b8 100644
--- a/java/org/apache/jasper/JspCompilationContext.java
+++ b/java/org/apache/jasper/JspCompilationContext.java
@@ -589,7 +589,6 @@ public class JspCompilationContext {
jspCompiler.removeGeneratedFiles();
jspLoader = null;
jspCompiler.compile();
- jsw.setReload(true);
jsw.setCompilationException(null);
} catch (JasperException ex) {
// Cache compilation exception
@@ -607,6 +606,8 @@ public class JspCompilationContext {
// Cache compilation exception
jsw.setCompilationException(je);
throw je;
+ } finally {
+ jsw.setReload(true);
}
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a852654c04..2c95245095 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -213,6 +213,10 @@
<code>jakarta.el.ELResolver.StandaloneIdentifierMarker</code>. (markt)
</scode>
<!-- Entries for backport and removal before 12.0.0-M1 below this line
-->
+ <fix>
+ <bug>69696</bug>: Mark the JSP wrapper for reload after a failed
+ compilation. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
