This is an automated email from the ASF dual-hosted git repository.
rmaucher pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 82a59bba36 Fix possible EL argument mismatch when it was set to null
82a59bba36 is described below
commit 82a59bba36b02d97ae091d99d85f5e9264e87cfd
Author: remm <[email protected]>
AuthorDate: Wed May 20 09:30:34 2026 +0200
Fix possible EL argument mismatch when it was set to null
---
java/jakarta/el/ELContext.java | 2 +-
webapps/docs/changelog.xml | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/java/jakarta/el/ELContext.java b/java/jakarta/el/ELContext.java
index d8f25ece9e..b0c585cb6c 100644
--- a/java/jakarta/el/ELContext.java
+++ b/java/jakarta/el/ELContext.java
@@ -312,7 +312,7 @@ public abstract class ELContext {
public Object getLambdaArgument(String name) {
for (Map<String,Object> arguments : getLambdaArguments()) {
Object result = arguments.get(name);
- if (result != null) {
+ if (result != null || arguments.containsKey(name)) {
return result;
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e7cfd9c0ad..e68c08289f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -158,6 +158,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ Fix possible EL argument mismatch when it was set to null. (remm)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Cluster">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
