svn commit: r1807221 - /myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java

[ta...@apache.org]

Author: tandraschko
Date: Mon Sep  4 13:08:18 2017
New Revision: 1807221

URL: http://svn.apache.org/viewvc?rev=1807221&view=rev
Log:
MYFACES-3250 disable ManagedBeanResolver

Modified:
    myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java

Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java?rev=1807221&r1=1807220&r2=1807221&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java Mon Sep  4 13:08:18 2017
@@ -98,6 +98,9 @@ public class ResolverBuilderForFaces ext
     @Override
     public void build(FacesContext facesContext, CompositeELResolver compositeElResolver)
     {
+        MyfacesConfig config = MyfacesConfig.getCurrentInstance(
+                     FacesContext.getCurrentInstance().getExternalContext());
+        
         // add the ELResolvers to a List first to be able to sort them
         List<ELResolver> list = new ArrayList<>();
 
@@ -122,7 +125,10 @@ public class ResolverBuilderForFaces ext
         //Flash object is instanceof Map, so it is necessary to resolve
         //before MapELResolver. Better to put this one before
         list.add(new FlashELResolver());
-        list.add(new ManagedBeanResolver());
+        if (config.isSupportManagedBeans())
+        {
+            list.add(new ManagedBeanResolver());
+        }
         list.add(new ResourceResolver());
         list.add(new ResourceBundleELResolver());
         list.add(new ResourceBundleResolver());
@@ -175,8 +181,7 @@ public class ResolverBuilderForFaces ext
         }
         
         // Only add this resolver if the user wants to use the EL ImportHandler
-        if (MyfacesConfig.getCurrentInstance(
-             FacesContext.getCurrentInstance().getExternalContext()).isSupportEL3ImportHandler())
+        if (config.isSupportEL3ImportHandler())
         {
             compositeElResolver.add(new ImportHandlerResolver());
         }