svn commit: r1386862 - /openejb/branches/openejb-4.1.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java

[rmannibucau]

Author: rmannibucau
Date: Mon Sep 17 21:51:40 2012
New Revision: 1386862

URL: http://svn.apache.org/viewvc?rev=1386862&view=rev
Log:
better test for cdi beans in war when deploying ear

Modified:
    
openejb/branches/openejb-4.1.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java

Modified: 
openejb/branches/openejb-4.1.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java
URL: 
http://svn.apache.org/viewvc/openejb/branches/openejb-4.1.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java?rev=1386862&r1=1386861&r2=1386862&view=diff
==============================================================================
--- 
openejb/branches/openejb-4.1.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java
 (original)
+++ 
openejb/branches/openejb-4.1.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappLoader.java
 Mon Sep 17 21:51:40 2012
@@ -262,9 +262,9 @@ public class TomEEWebappLoader extends W
             return app.hashCode();
         }
 
-        @Override
+        @Override // used to add cdi beans in the webbeanscontext, don't add 
parent beans
         public boolean isSame(final ClassLoader classLoader) {
-            return classLoader == this; // not equals ;)
+            return classLoader == this || (webapp != null && 
webapp.equals(classLoader)); // not equals ;)
         }
     }
 }