svn commit: r1391426 - /openejb/branches/openejb-4.5.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContext.java

[rmannibucau]

Author: rmannibucau
Date: Fri Sep 28 12:29:12 2012
New Revision: 1391426

URL: http://svn.apache.org/viewvc?rev=1391426&view=rev
Log:
TOMEE-434 using webapp JNDI tree instead of DeployerEJB one when deploying an 
app with DeployerEjb

Modified:
    
openejb/branches/openejb-4.5.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContext.java

Modified: 
openejb/branches/openejb-4.5.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContext.java
URL: 
http://svn.apache.org/viewvc/openejb/branches/openejb-4.5.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContext.java?rev=1391426&r1=1391425&r2=1391426&view=diff
==============================================================================
--- 
openejb/branches/openejb-4.5.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContext.java
 (original)
+++ 
openejb/branches/openejb-4.5.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContext.java
 Fri Sep 28 12:29:12 2012
@@ -17,6 +17,8 @@
  */
 package org.apache.tomee.catalina;
 
+import org.apache.naming.ContextBindings;
+import org.apache.openejb.assembler.DeployerEjb;
 import org.apache.openejb.core.ThreadContext;
 
 import javax.naming.Binding;
@@ -254,9 +256,19 @@ public class OpenEJBContext implements C
      */
     private Context getThreadContext() throws NamingException {
         ThreadContext threadContext = ThreadContext.getThreadContext();
+        if (skipEjbContext(threadContext)) {
+            return ContextBindings.getClassLoader();
+        }
         Context context = threadContext.getBeanContext().getJndiEnc();
         return context;
     }
 
+    private boolean skipEjbContext(final ThreadContext threadContext) {
+        // we use it to deploy so if any lookup is done during the deployment
+        // we don't want to get the DeployerEjb JNDI tree
+        // since this method is pretty quick that's not an issue to do the test
+        return 
DeployerEjb.class.equals(threadContext.getBeanContext().getBeanClass());
+    }
+
 }