This is an automated email from the ASF dual-hosted git repository.
rmaucher 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 f1de3867b9 Fix possible EL argument mismatch when it was set to null
f1de3867b9 is described below
commit f1de3867b9d676533e759901ad30878fb034389f
Author: remm <[email protected]>
AuthorDate: Wed May 20 09:20:32 2026 +0200
Fix possible EL argument mismatch when it was set to null
---
java/jakarta/el/ELContext.java | 2 +-
webapps/docs/changelog.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/java/jakarta/el/ELContext.java b/java/jakarta/el/ELContext.java
index d0f7e4adbe..5577fe3ef9 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 51511e3a15..65367a8afb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -329,6 +329,9 @@
<fix>
Fix EL standalone interface bean properties discovery. (remm)
</fix>
+ <fix>
+ Fix possible EL argument mismatch when it was set to null. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
