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

[rmannibucau]

Author: rmannibucau
Date: Wed May  9 18:24:44 2012
New Revision: 1336329

URL: http://svn.apache.org/viewvc?rev=1336329&view=rev
Log:
TOMEE-189 in standalone a cdi bean can have been loaded by appclassloader and 
not the module classloader so enhancing the filetring

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

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java?rev=1336329&r1=1336328&r2=1336329&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
 Wed May  9 18:24:44 2012
@@ -27,6 +27,7 @@ import java.util.Set;
 import javax.interceptor.Interceptor;
 
 import org.apache.openejb.AppContext;
+import org.apache.openejb.OpenEJB;
 import org.apache.openejb.assembler.classic.AppInfo;
 import org.apache.openejb.assembler.classic.BeansInfo;
 import org.apache.openejb.assembler.classic.EjbJarInfo;
@@ -144,7 +145,10 @@ public class CdiScanner implements Scann
             for (String className : beans.managedClasses) {
                 if (ejbClasses.contains(className)) continue;
                 final Class clazz = load(className, classLoader);
-                if (clazz != null && 
classLoader.equals(clazz.getClassLoader())) {
+                final ClassLoader clazzClassloader = clazz.getClassLoader();
+                if (clazz != null
+                        && (classLoader.equals(clazzClassloader) // normal case
+                                || 
clazzClassloader.equals(CdiScanner.class.getClassLoader()))) { // can happen in 
standalone
                     classes.add(clazz);
                 }
             }