Improve #4933: CDI#getBeanManager() should be last thing after JNDI as

JNDI can be configured app-wide while CDI#current() is server-wide
eclipse-ee4j · May 23, 2021 · 98189be · 98189be
1 parent 47c87ce
commit 98189be
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/impl/src/main/java/com/sun/faces/util/Util.java b/impl/src/main/java/com/sun/faces/util/Util.java
@@ -1559,20 +1559,20 @@ public static BeanManager getCdiBeanManager(FacesContext facesContext) {
             result = (BeanManager) facesContext.getExternalContext().getApplicationMap().get(RIConstants.CDI_BEAN_MANAGER);
         } else {
             try {
-                CDI<Object> cdi = CDI.current();
-                result = cdi.getBeanManager();
+                InitialContext initialContext = new InitialContext();
+                result = (BeanManager) initialContext.lookup("java:comp/BeanManager");
             }
-            catch (Exception | LinkageError e) {
+            catch (NamingException ne) {
                 try {
                     InitialContext initialContext = new InitialContext();
-                    result = (BeanManager) initialContext.lookup("java:comp/BeanManager");
+                    result = (BeanManager) initialContext.lookup("java:comp/env/BeanManager");
                 }
-                catch (NamingException ne) {
+                catch (NamingException ne2) {
                     try {
-                        InitialContext initialContext = new InitialContext();
-                        result = (BeanManager) initialContext.lookup("java:comp/env/BeanManager");
+                        CDI<Object> cdi = CDI.current();
+                        result = cdi.getBeanManager();
                     }
-                    catch (NamingException ne2) {
+                    catch (Exception | LinkageError e) {
                     }
                 }
             }