svn commit: r1482458 - in /tomee/tomee/trunk: container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappWebBeansContext.java tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java

[rmannibucau]

Author: rmannibucau
Date: Tue May 14 16:58:48 2013
New Revision: 1482458

URL: http://svn.apache.org/r1482458
Log:
NPE + thread safety

Modified:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappWebBeansContext.java
    
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappWebBeansContext.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappWebBeansContext.java?rev=1482458&r1=1482457&r2=1482458&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappWebBeansContext.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappWebBeansContext.java
 Tue May 14 16:58:48 2013
@@ -33,7 +33,11 @@ public class WebappWebBeansContext exten
     @Override
     public BeanManagerImpl getBeanManagerImpl() {
         if (bm == null) { // should be done in the constructor
-            bm = new WebappBeanManager(this);
+            synchronized (this) {
+                if (bm == null) {
+                    bm = new WebappBeanManager(this);
+                }
+            }
         }
         return bm;
     }

Modified: 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java?rev=1482458&r1=1482457&r2=1482458&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
 Tue May 14 16:58:48 2013
@@ -284,7 +284,7 @@ public class TomcatJndiBuilder {
             comp.rebind("ORB", new SystemComponentReference(ORB.class));
             comp.rebind("HandleDelegate", new 
SystemComponentReference(HandleDelegate.class));
 
-            if (webContext != null) {
+            if (webContext != null && webContext.getWebbeansContext() != null) 
{
                 comp.rebind("BeanManager", 
webContext.getWebbeansContext().getBeanManagerImpl());
             } else if (contextInfo != null) {
                 comp.rebind("BeanManager", 
cs.getAppContext(contextInfo.appInfo.appId).getBeanManager());