myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tandrasc...@apache.org
Subject [myfaces] branch master updated: MYFACES-4241
Date Fri, 22 Jun 2018 12:14:07 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
     new 085aa9d  MYFACES-4241
085aa9d is described below

commit 085aa9d29a866f5b5ccdd21a145ad8915350d48e
Author: Thomas Andraschko <tandraschko@apache.org>
AuthorDate: Fri Jun 22 14:14:03 2018 +0200

    MYFACES-4241
---
 .../java/org/apache/myfaces/el/unified/ResolverBuilderBase.java     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java b/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java
index f603e34..c2808d7 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java
@@ -39,6 +39,7 @@ import org.apache.myfaces.el.convert.PropertyResolverToELResolver;
 import org.apache.myfaces.el.convert.VariableResolverToELResolver;
 import org.apache.myfaces.el.unified.resolver.FacesCompositeELResolver.Scope;
 import org.apache.myfaces.shared.config.MyfacesConfig;
+import org.apache.myfaces.util.ExternalSpecifications;
 
 /**
  * @author Mathias Broekelmann (latest modification by $Author$)
@@ -226,6 +227,11 @@ public class ResolverBuilderBase
     
     protected boolean isReplaceImplicitObjectResolverWithCDIResolver(FacesContext facesContext)
     {
+        if (!ExternalSpecifications.isCDIAvailable(facesContext.getExternalContext()))
+        {
+            return false;
+        }
+
         BeanManager beanManager = CDIUtils.getBeanManager(facesContext.getExternalContext());
         if (beanManager != null)
         {


Mime
View raw message