You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/11/11 16:11:16 UTC
svn commit: r1033960 -
/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/provider/BeanManagerProvider.java
Author: gpetracek
Date: Thu Nov 11 15:11:16 2010
New Revision: 1033960
URL: http://svn.apache.org/viewvc?rev=1033960&view=rev
Log:
workaround for jboss as 6 based on EXTCDI-74 - thx to Rudy De Busscher
Modified:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/provider/BeanManagerProvider.java
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/provider/BeanManagerProvider.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/provider/BeanManagerProvider.java?rev=1033960&r1=1033959&r2=1033960&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/provider/BeanManagerProvider.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/provider/BeanManagerProvider.java Thu Nov 11 15:11:16 2010
@@ -24,6 +24,8 @@ import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.Extension;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -64,7 +66,40 @@ public class BeanManagerProvider impleme
{
ClassLoader cl = ClassUtils.getClassLoader(null);
- return bms.get(cl);
+ BeanManager result = bms.get(cl);
+
+ if (result == null)
+ {
+ result = resolveBeanManagerViaJndi();
+
+ if(result != null)
+ {
+ bms.put(cl, result);
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Get the BeanManager from the JNDI registry.
+ *
+ * Workaround for jboss 6 (EXTCDI-74)
+ * {@link #setBeanManager(javax.enterprise.inject.spi.AfterBeanDiscovery, javax.enterprise.inject.spi.BeanManager)}
+ * is called in context of a different classloader
+ *
+ * @return current {@link javax.enterprise.inject.spi.BeanManager} which is provided via jndi
+ */
+ private BeanManager resolveBeanManagerViaJndi()
+ {
+ try
+ {
+ return (BeanManager) new InitialContext().lookup("java:comp/BeanManager");
+ }
+ catch (NamingException e)
+ {
+ //workaround didn't work -> force NPE
+ return null;
+ }
}
/**