You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by wt...@apache.org on 2016/02/12 22:25:03 UTC
svn commit: r1730111 -
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/ExternalSpecifications.java
Author: wtlucy
Date: Fri Feb 12 21:25:02 2016
New Revision: 1730111
URL: http://svn.apache.org/viewvc?rev=1730111&view=rev
Log:
MYFACES-4030 MyFaces CDI support is disabled if non-CDI application is loaded first
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/ExternalSpecifications.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/ExternalSpecifications.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/ExternalSpecifications.java?rev=1730111&r1=1730110&r2=1730111&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/ExternalSpecifications.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/ExternalSpecifications.java Fri Feb 12 21:25:02 2016
@@ -142,26 +142,12 @@ public final class ExternalSpecification
//log.log(Level.FINE, "Error loading class (could be normal)", t);
cdiAvailable = false;
}
-
- if (cdiAvailable)
- {
- cdiAvailable = externalContext.getApplicationMap().containsKey(
- AbstractFacesInitializer.CDI_BEAN_MANAGER_INSTANCE);
- }
log.info("MyFaces CDI support " + (cdiAvailable ? "enabled" : "disabled"));
-
- return cdiAvailable;
- }
- else
- {
- if (Boolean.TRUE.equals(cdiAvailable))
- {
- return externalContext.getApplicationMap().containsKey(
- AbstractFacesInitializer.CDI_BEAN_MANAGER_INSTANCE);
- }
- return cdiAvailable;
}
+
+ return cdiAvailable &&
+ externalContext.getApplicationMap().containsKey(AbstractFacesInitializer.CDI_BEAN_MANAGER_INSTANCE);
}
public static boolean isEL3Available()