[tomcat] branch 10.0.x updated: Fix ELContext save/restore after fragment helper invoke

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.0.x by this push:
     new fdf7dce  Fix ELContext save/restore after fragment helper invoke
fdf7dce is described below

commit fdf7dce08f3d825bd9a9f3ffc3163eaeb428b8b4
Author: Dmitri Blinov <dmitri_bli...@mail.ru>
AuthorDate: Sun Feb 13 15:07:15 2022 +0300

    Fix ELContext save/restore after fragment helper invoke
---
 java/org/apache/jasper/runtime/JspContextWrapper.java | 4 +++-
 webapps/docs/changelog.xml                            | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/jasper/runtime/JspContextWrapper.java 
b/java/org/apache/jasper/runtime/JspContextWrapper.java
index 3f1f9c7..8aa47cc 100644
--- a/java/org/apache/jasper/runtime/JspContextWrapper.java
+++ b/java/org/apache/jasper/runtime/JspContextWrapper.java
@@ -555,7 +555,9 @@ public class JspContextWrapper extends PageContext 
implements VariableResolver {
 
         @Override
         public void putContext(Class<?> key, Object contextObject) {
-            wrapped.putContext(key, contextObject);
+            if (key != JspContext.class) {
+                wrapped.putContext(key, contextObject);
+            }
         }
 
         @Override
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7aa98fc..da29e04 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -177,6 +177,14 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="Jasper">
+    <changelog>
+      <fix>
+        <pr>474</pr>: Prevent a tag file from corrupting the ELContext of the
+        calling page. Pull request provided by Dmitri Blinov. (markt)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Web applications">
     <changelog>
       <fix>

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