You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2020/10/09 23:15:09 UTC
[myfaces] branch 3.0.x updated: MYFACES-4362: Uncomment BeanManager
ELResolver addition
This is an automated email from the ASF dual-hosted git repository.
tandraschko 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 9f5f2c8 MYFACES-4362: Uncomment BeanManager ELResolver addition
new 416d87f Merge pull request #119 from pnicolucci/MYFACES-4362
9f5f2c8 is described below
commit 9f5f2c8aa9a43fe9b5cdcceeec410ac289510db6
Author: Paul Nicolucci <pn...@gmail.com>
AuthorDate: Fri Oct 9 18:28:51 2020 -0400
MYFACES-4362: Uncomment BeanManager ELResolver addition
---
.../java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java | 3 +--
.../main/java/org/apache/myfaces/el/unified/ResolverBuilderForJSP.java | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java b/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java
index 24c760e..7dfea3b 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java
@@ -111,8 +111,7 @@ public class ResolverBuilderForFaces extends ResolverBuilderBase implements ELRe
BeanManager beanManager = CDIUtils.getBeanManager(
FacesContext.getCurrentInstance().getExternalContext());
- // TODO JakartaFaces
- //list.add(beanManager.getELResolver());
+ list.add(beanManager.getELResolver());
}
else
{
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForJSP.java b/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForJSP.java
index f5d6fa7..6ca5ddb 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForJSP.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForJSP.java
@@ -63,8 +63,7 @@ public class ResolverBuilderForJSP extends ResolverBuilderBase implements ELReso
//Add CDI ELResolver instead.
BeanManager beanManager = CDIUtils.getBeanManager(
FacesContext.getCurrentInstance().getExternalContext());
- // TODO JakartaFaces
- //list.add(beanManager.getELResolver());
+ list.add(beanManager.getELResolver());
}
else
{