svn commit: r1336307 - in /openejb/trunk/openejb: container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java

[rmannibucau]

Author: rmannibucau
Date: Wed May  9 17:28:58 2012
New Revision: 1336307

URL: http://svn.apache.org/viewvc?rev=1336307&view=rev
Log:
TOMEE-189 filtering cdi beans by classloader: webapp shouldn't deploy parent 
beans

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
    
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.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=1336307&r1=1336306&r2=1336307&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 17:28:58 2012
@@ -144,7 +144,7 @@ public class CdiScanner implements Scann
             for (String className : beans.managedClasses) {
                 if (ejbClasses.contains(className)) continue;
                 final Class clazz = load(className, classLoader);
-                if (clazz != null) {
+                if (clazz != null && 
classLoader.equals(clazz.getClassLoader())) {
                     classes.add(clazz);
                 }
             }

Modified: 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java?rev=1336307&r1=1336306&r2=1336307&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java
 Wed May  9 17:28:58 2012
@@ -151,5 +151,10 @@ public class TomEEWebappLoader extends W
                private static File file(URL jarUrl) {
             return URLs.toFile(jarUrl);
                }
+
+        @Override
+        public boolean equals(Object other) {
+            return other == this || other == webapp;
+        }
     }
 }