svn commit: r1546455 - in /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb: cdi/WebappWebBeansContext.java core/singleton/SingletonEjbObjectHandler.java

[tveronezi]

Author: tveronezi
Date: Thu Nov 28 20:35:30 2013
New Revision: 1546455

URL: http://svn.apache.org/r1546455
Log:
it looks like it broke the build big time.
Reverting and firing the build again.

Modified:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappWebBeansContext.java
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbObjectHandler.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=1546455&r1=1546454&r2=1546455&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
 Thu Nov 28 20:35:30 2013
@@ -16,24 +16,30 @@
  */
 package org.apache.openejb.cdi;
 
-import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.container.BeanManagerImpl;
-
 import java.util.Map;
 import java.util.Properties;
+import org.apache.webbeans.config.WebBeansContext;
+import org.apache.webbeans.container.BeanManagerImpl;
 
 public class WebappWebBeansContext extends WebBeansContext {
-    private final WebBeansContext parent;
-    private final BeanManagerImpl bm;
+    private WebBeansContext parent;
+    private BeanManagerImpl bm;
 
     public WebappWebBeansContext(Map<Class<?>, Object> services, Properties 
properties, WebBeansContext webBeansContext) {
         super(services, properties);
-        this.parent = webBeansContext;
-        this.bm = new WebappBeanManager(this);
+        parent = webBeansContext;
     }
 
+    @SuppressWarnings("PMD.DoubleCheckedLocking")
     @Override
     public BeanManagerImpl getBeanManagerImpl() {
+        if (bm == null) { // should be done in the constructor
+            synchronized (this) {
+                if (bm == null) {
+                    bm = new WebappBeanManager(this);
+                }
+            }
+        }
         return bm;
     }
 

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbObjectHandler.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbObjectHandler.java?rev=1546455&r1=1546454&r2=1546455&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbObjectHandler.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbObjectHandler.java
 Thu Nov 28 20:35:30 2013
@@ -50,7 +50,7 @@ public class SingletonEjbObjectHandler e
     protected Object isIdentical(Method method, Object[] args, Object proxy) 
throws Throwable {
         try {
             EjbObjectProxyHandler handler = (EjbObjectProxyHandler) 
ProxyManager.getInvocationHandler(args[0]);
-            return deploymentID.equals(handler.deploymentID);
+            return new Boolean(deploymentID.equals(handler.deploymentID)); 
//NOPMD
         } catch (Throwable t) {
             return Boolean.FALSE;
         }