This is an automated email from the ASF dual-hosted git repository.
rmaucher 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 00c991465b Fix possible EL argument mismatch when it was set to null
00c991465b is described below
commit 00c991465bfb5d6f315c572886e067bf383bdf1c
Author: remm <[email protected]>
AuthorDate: Wed May 20 09:32:20 2026 +0200
Fix possible EL argument mismatch when it was set to null
---
java/javax/el/ELContext.java | 2 +-
webapps/docs/changelog.xml | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/java/javax/el/ELContext.java b/java/javax/el/ELContext.java
index 98ec843253..9c21eec6d7 100644
--- a/java/javax/el/ELContext.java
+++ b/java/javax/el/ELContext.java
@@ -262,7 +262,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 418d06a389..343225aa23 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -154,6 +154,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]
