svn commit: r1599412 - /tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContext.java

[rm...@apache.org]

Author: rmannibucau
Date: Tue Jun  3 05:38:40 2014
New Revision: 1599412

URL: http://svn.apache.org/r1599412
Log:
NPE protection for tomee embedded where DeployerEjb is not used

Modified:
    tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContext.java

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContext.java?rev=1599412&r1=1599411&r2=1599412&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContext.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContext.java Tue Jun  3 05:38:40 2014
@@ -259,7 +259,7 @@ public class OpenEJBContext implements C
         // 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());
+        return threadContext == null || DeployerEjb.class.equals(threadContext.getBeanContext().getBeanClass());
     }
 
 }