You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/09/24 20:02:40 UTC

svn commit: r1627378 - /tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LazyRealm.java

Author: rmannibucau
Date: Wed Sep 24 18:02:39 2014
New Revision: 1627378

URL: http://svn.apache.org/r1627378
Log:
LazyRealm lifecyle, we can get the web beans context before being deployed

Modified:
    tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LazyRealm.java

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LazyRealm.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LazyRealm.java?rev=1627378&r1=1627377&r2=1627378&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LazyRealm.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LazyRealm.java Wed Sep 24 18:02:39 2014
@@ -110,6 +110,9 @@ public class LazyRealm extends Lifecycle
                         final BeanManager bm = webBeansContext.getBeanManagerImpl();
                         final Set<Bean<?>> beans = bm.getBeans(clazz);
                         final Bean<?> bean = bm.resolve(beans);
+                        if (bean == null) {
+                            return null;
+                        }
                         creationalContext = bm.createCreationalContext(null);
                         instance = bm.getReference(bean, clazz, creationalContext);
                     }