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 2022/02/15 16:47:16 UTC
[tomcat] branch 9.0.x updated: Fix ELContext save/restore after fragment helper invoke
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 3f14e72 Fix ELContext save/restore after fragment helper invoke
3f14e72 is described below
commit 3f14e721990886fe1b2de709990d59acdf5cfed2
Author: Dmitri Blinov <dm...@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 ccccd35..6548d38 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(@SuppressWarnings("rawtypes") 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 4a2a6c0..ee566ea 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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org