svn commit: r1594288 - in /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb: assembler/classic/Assembler.java cdi/CdiPlugin.java

[rmannibucau]

Author: rmannibucau
Date: Tue May 13 17:05:28 2014
New Revision: 1594288

URL: http://svn.apache.org/r1594288
Log:
skipping DynamicallyImplemented ejbs when using BeanContext.ProxyClass

Modified:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1594288&r1=1594287&r2=1594288&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 Tue May 13 17:05:28 2014
@@ -1066,7 +1066,7 @@ public class Assembler extends Assembler
                 }
 
                 // if local bean or mdb generate proxy class now to avoid 
bottleneck on classloader later
-                if (beanContext.isLocalbean() && 
!beanContext.getComponentType().isMessageDriven()) {
+                if (beanContext.isLocalbean() && 
!beanContext.getComponentType().isMessageDriven() && 
!beanContext.isDynamicallyImplemented()) {
                     final List<Class> interfaces = new ArrayList<Class>(3);
                     interfaces.add(Serializable.class);
                     interfaces.add(IntraVmProxy.class);

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java?rev=1594288&r1=1594287&r2=1594288&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
 Tue May 13 17:05:28 2014
@@ -120,8 +120,7 @@ public class CdiPlugin extends AbstractO
         beans = new WeakHashMap<Class<?>, BeanContext>();
         for (final BeanContext deployment : ejbDeployments) {
             if (deployment.getComponentType().isSession()) {
-                if (deployment.isLocalbean())
-                {
+                if (deployment.isLocalbean() && 
!deployment.isDynamicallyImplemented()) {
                     
beans.put(deployment.get(BeanContext.ProxyClass.class).getProxy(), deployment);
                 }
                 beans.put(deployment.getBeanClass(), deployment);