svn commit: r1401257 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java

[rmannibucau]

Author: rmannibucau
Date: Tue Oct 23 12:05:09 2012
New Revision: 1401257

URL: http://svn.apache.org/viewvc?rev=1401257&view=rev
Log:
TOMEE-495 using local business interfaces even if localbean

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java?rev=1401257&r1=1401256&r2=1401257&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
 Tue Oct 23 12:05:09 2012
@@ -63,7 +63,7 @@ public class CdiEjbBean<T> extends BaseE
     }
 
     @Override
-    public void addApiType(Class<?> apiType) {
+    public void addApiType(final Class<?> apiType) {
         if (apiType == null) return;
 
         super.addApiType(apiType);
@@ -113,19 +113,20 @@ public class CdiEjbBean<T> extends BaseE
     @Override
     @SuppressWarnings("unchecked")
     public List<Class<?>> getBusinessLocalInterfaces() {
-        List<Class<?>> clazzes = new ArrayList<Class<?>>();
+        final List<Class<?>> clazzes = new ArrayList<Class<?>>();
 
         if (beanContext.isLocalbean()) {
             addApiTypes(clazzes, beanContext.getBeanClass());
-        } else if (beanContext.getProxyClass() != null) {
+        }
+
+        if (beanContext.getProxyClass() != null) {
             addApiTypes(clazzes, beanContext.getProxyClass());
-        } else {
-            List<Class> cl = beanContext.getBusinessLocalInterfaces();
+        }
 
-            if (cl != null && !cl.isEmpty()) {
-                for (Class<?> c : cl) {
-                    clazzes.add(c);
-                }
+        final List<Class> cl = beanContext.getBusinessLocalInterfaces();
+        if (cl != null && !cl.isEmpty()) {
+            for (Class<?> c : cl) {
+                clazzes.add(c);
             }
         }