[myfaces] branch main updated: MYFACES-4547: return new DefaultVariableMapper if variableMapper is null (#490)

[me...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

melloware pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/main by this push:
     new fa53a1163 MYFACES-4547: return new DefaultVariableMapper if variableMapper is null (#490)
fa53a1163 is described below

commit fa53a116334731fe5570fb62731a9d6f2b5718a3
Author: Paul A. Nicolucci <pn...@gmail.com>
AuthorDate: Thu Jan 19 10:46:45 2023 -0500

    MYFACES-4547: return new DefaultVariableMapper if variableMapper is null (#490)
---
 impl/src/main/java/org/apache/myfaces/el/FacesELContext.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/impl/src/main/java/org/apache/myfaces/el/FacesELContext.java b/impl/src/main/java/org/apache/myfaces/el/FacesELContext.java
index 8e89c4bb7..ab3d2e433 100644
--- a/impl/src/main/java/org/apache/myfaces/el/FacesELContext.java
+++ b/impl/src/main/java/org/apache/myfaces/el/FacesELContext.java
@@ -24,6 +24,8 @@ import jakarta.el.FunctionMapper;
 import jakarta.el.VariableMapper;
 import jakarta.faces.context.FacesContext;
 
+import org.apache.myfaces.view.facelets.el.DefaultVariableMapper;
+
 /**
  * ELContext used for Faces.
  * 
@@ -44,6 +46,11 @@ public class FacesELContext extends ELContext
     @Override
     public VariableMapper getVariableMapper()
     {
+        if (variableMapper == null)
+        {
+            variableMapper = new DefaultVariableMapper();
+        }
+
         return variableMapper;
     }