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-4248
Date Mon, 16 Jul 2018 13:36:22 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 92d6404  MYFACES-4248
92d6404 is described below

commit 92d640492adaa90ff25e4d9ea6b03ceea73956c2
Author: Thomas Andraschko <tandraschko@apache.org>
AuthorDate: Mon Jul 16 15:36:16 2018 +0200

    MYFACES-4248
---
 .../myfaces/el/unified/OpenWebBeansELResolverComparator.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/OpenWebBeansELResolverComparator.java
b/impl/src/main/java/org/apache/myfaces/el/unified/OpenWebBeansELResolverComparator.java
index 06fed67..eff3fb8 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/OpenWebBeansELResolverComparator.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/OpenWebBeansELResolverComparator.java
@@ -33,19 +33,21 @@ import javax.el.ELResolver;
 public class OpenWebBeansELResolverComparator implements Comparator<ELResolver>
 {
     
-    public static final String OWB_RESOLVER = "org.apache.webbeans.el.WebBeansELResolver";
+    public static final String OWB_RESOLVER_OLD = "org.apache.webbeans.el.WebBeansELResolver";
+    public static final String OWB_RESOLVER     = "org.apache.webbeans.el22.WebBeansELResolver";
 
+    @Override
     public int compare(ELResolver r1, ELResolver r2)
     {
-        if (r1.getClass().getName().equals(OWB_RESOLVER))
+        if (r1.getClass().getName().equals(OWB_RESOLVER_OLD) || r1.getClass().getName().equals(OWB_RESOLVER))
         {
             return 1;
         }
-        else if (r2.getClass().getName().equals(OWB_RESOLVER))
+        else if (r2.getClass().getName().equals(OWB_RESOLVER_OLD) || r2.getClass().getName().equals(OWB_RESOLVER))
         {
             return -1;
         }
         return 0; // keep order
     }
-    
+   
 }


Mime
View raw message