[myfaces] branch 3.0.x updated: MYFACES-4547: return new DefaultVariableMapper if _variableMapper is null

[pa...@apache.org]

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

paulnicolucci pushed a commit to branch 3.0.x
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/3.0.x by this push:
     new c6463e2ad MYFACES-4547: return new DefaultVariableMapper if _variableMapper is null
     new 0aae2cd37 Merge pull request #494 from pnicolucci/MYFACES-4547-30
c6463e2ad is described below

commit c6463e2ad6b052cb64ebb3f71c27edb9c968a5ca
Author: Paul Nicolucci <pn...@gmail.com>
AuthorDate: Fri Jan 20 14:27:02 2023 -0500

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

diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/FacesELContext.java b/impl/src/main/java/org/apache/myfaces/el/unified/FacesELContext.java
index 7b7833060..1b9905903 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/FacesELContext.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/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 JSF.
  * 
@@ -50,6 +52,11 @@ public class FacesELContext extends ELContext
     @Override
     public VariableMapper getVariableMapper()
     {
+        if (_variableMapper == null)
+        {
+            _variableMapper = new DefaultVariableMapper();
+        }
+
         return _variableMapper;
     }