[myfaces] branch 2.2.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 2.2.x
in repository https://gitbox.apache.org/repos/asf/myfaces.git


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

commit 0f28a3340f65e233ded372f58f6b436d4268bce2
Author: Paul Nicolucci <pn...@gmail.com>
AuthorDate: Sun Jan 22 12:00:18 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 c08b5d994..d54d5962f 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 javax.el.FunctionMapper;
 import javax.el.VariableMapper;
 import javax.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;
     }