This is an automated email from the ASF dual-hosted git repository.
markt 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 d4f1666 Fix ELContext save/restore after fragment helper invoke
d4f1666 is described below
commit d4f16663214ef6ce2c46892db4c20a505df74aff
Author: Dmitri Blinov <[email protected]>
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 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/jasper/runtime/JspContextWrapper.java
b/java/org/apache/jasper/runtime/JspContextWrapper.java
index a7820a7..9601d81 100644
--- a/java/org/apache/jasper/runtime/JspContextWrapper.java
+++ b/java/org/apache/jasper/runtime/JspContextWrapper.java
@@ -556,7 +556,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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
