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

[rmannibucau]

Author: rmannibucau
Date: Wed May  9 23:25:21 2012
New Revision: 1336450

URL: http://svn.apache.org/viewvc?rev=1336450&view=rev
Log:
TOMEE-189 filtering cdi classes by classloader breaks too much things

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=1336450&r1=1336449&r2=1336450&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 23:25:21 2012
@@ -142,14 +142,10 @@ public class CdiScanner implements Scann
                 }
             }
 
-            final ClassLoader scl = ClassLoader.getSystemClassLoader();
             for (String className : beans.managedClasses) {
                 if (ejbClasses.contains(className)) continue;
                 final Class clazz = load(className, classLoader);
-                final ClassLoader clazzClassloader = clazz.getClassLoader();
-                if (clazz != null
-                        && (classLoader.equals(clazzClassloader) // normal case
-                                || clazzClassloader.equals(scl))) { // can 
happen in standalone
+                if (clazz != null) { // can happen in standalone
                     classes.add(clazz);
                 }
             }