svn commit: r1134873 - in /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb: assembler/classic/ProxyInterfaceResolver.java cdi/CdiPlugin.java

[djencks]

Author: djencks
Date: Sun Jun 12 07:10:27 2011
New Revision: 1134873

URL: http://svn.apache.org/viewvc?rev=1134873&view=rev
Log:
OPENEJB-1577 ignore Object as main proxy class from cdi

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

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ProxyInterfaceResolver.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ProxyInterfaceResolver.java?rev=1134873&r1=1134872&r2=1134873&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ProxyInterfaceResolver.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ProxyInterfaceResolver.java
 Sun Jun 12 07:10:27 2011
@@ -28,7 +28,9 @@ public class ProxyInterfaceResolver {
     public static List<Class> getInterfaces(Class implementation, Class 
mainInterface, List<Class> interfaces){
         List<Class> valid = new ArrayList<Class>();
         // The intended interface is safe to add
-        valid.add(mainInterface);
+        if (mainInterface != null) {
+            valid.add(mainInterface);
+        }
 
         // Any interface the bean implements is safe (potentially)
         for (Class interfce : interfaces) {

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java?rev=1134873&r1=1134872&r2=1134873&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
 Sun Jun 12 07:10:27 2011
@@ -168,7 +168,7 @@ public class CdiPlugin extends AbstractO
                final Class beanClass = deployment.getBeanClass();
                final List<Class> localInterfaces = 
deployment.getBusinessLocalInterfaces();
 
-               List<Class> interfaces = 
ProxyInterfaceResolver.getInterfaces(beanClass, interfce, localInterfaces);
+               List<Class> interfaces = 
ProxyInterfaceResolver.getInterfaces(beanClass, interfce == Object.class? null: 
interfce, localInterfaces);
                BeanContext.BusinessLocalHome home = 
deployment.getBusinessLocalHome(interfaces, interfaces.get(0));
                return home.create();