(tomcat) branch main updated: Use lazy initialisation for lambdaArguments

[markt]

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 f778219a6c Use lazy initialisation for lambdaArguments
f778219a6c is described below

commit f778219a6cfc53cbebcda0fd653bc622338415fd
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Oct 3 10:02:47 2024 +0100

    Use lazy initialisation for lambdaArguments
    
    This aligns with other fields in ELContext that already use lazy
    initialisation
---
 java/jakarta/el/ELContext.java | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/java/jakarta/el/ELContext.java b/java/jakarta/el/ELContext.java
index 12840d1597..98f0856796 100644
--- a/java/jakarta/el/ELContext.java
+++ b/java/jakarta/el/ELContext.java
@@ -40,12 +40,19 @@ public abstract class ELContext {
 
     private List<EvaluationListener> listeners;
 
-    private Deque<Map<String,Object>> lambdaArguments = new ArrayDeque<>();
+    private Deque<Map<String,Object>> lambdaArguments = null;
 
     public ELContext() {
         this.resolved = false;
     }
 
+    private Deque<Map<String,Object>> getLambdaArguments() {
+        if (lambdaArguments == null) {
+            lambdaArguments = new ArrayDeque<>(4);
+        }
+        return lambdaArguments;
+    }
+
     public void setPropertyResolved(boolean resolved) {
         this.resolved = resolved;
     }
@@ -235,7 +242,7 @@ public abstract class ELContext {
      * @since EL 3.0
      */
     public boolean isLambdaArgument(String name) {
-        for (Map<String,Object> arguments : lambdaArguments) {
+        for (Map<String,Object> arguments : getLambdaArguments()) {
             if (arguments.containsKey(name)) {
                 return true;
             }
@@ -253,7 +260,7 @@ public abstract class ELContext {
      * @since EL 3.0
      */
     public Object getLambdaArgument(String name) {
-        for (Map<String,Object> arguments : lambdaArguments) {
+        for (Map<String,Object> arguments : getLambdaArguments()) {
             Object result = arguments.get(name);
             if (result != null) {
                 return result;
@@ -271,7 +278,7 @@ public abstract class ELContext {
      * @since EL 3.0
      */
     public void enterLambdaScope(Map<String,Object> arguments) {
-        lambdaArguments.push(arguments);
+        getLambdaArguments().push(arguments);
     }
 
     /**
@@ -280,7 +287,7 @@ public abstract class ELContext {
      * @since EL 3.0
      */
     public void exitLambdaScope() {
-        lambdaArguments.pop();
+        getLambdaArguments().pop();
     }
 
     /**


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org