[GitHub] pnicolucci closed pull request #13: MYFACES-4248

[GitBox <gi...@apache.org>]

pnicolucci closed pull request #13: MYFACES-4248
URL: https://github.com/apache/myfaces/pull/13
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

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 06fed6728..425d23553 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,15 +33,17 @@
 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;
         }


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services