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


The following commit(s) were added to refs/heads/2.3-next by this push:
     new 9aea585e6 MYFACES-4547: return new DefaultVariableMapper if _variableMapper is null
     new 7f0f2c961 Merge pull request #495 from pnicolucci/MYFACES-4547-23next
9aea585e6 is described below

commit 9aea585e6224783c864c3e72f968f1bb4b0fdf3c
Author: Paul Nicolucci <pn...@gmail.com>
AuthorDate: Fri Jan 20 14:55:08 2023 -0500

    MYFACES-4547: return new DefaultVariableMapper if _variableMapper is null
---
 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 f7c7996db..54469e866 100644
--- a/impl/src/main/java/org/apache/myfaces/el/FacesELContext.java
+++ b/impl/src/main/java/org/apache/myfaces/el/FacesELContext.java
@@ -28,6 +28,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.
  * 
@@ -51,6 +53,11 @@ public class FacesELContext extends ELContext
     @Override
     public VariableMapper getVariableMapper()
     {
+        if (_variableMapper == null)
+        {
+            _variableMapper = new DefaultVariableMapper();
+        }
+
         return _variableMapper;
     }