svn commit: r1504455 - /tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java

[rmannibucau]

Author: rmannibucau
Date: Thu Jul 18 13:07:17 2013
New Revision: 1504455

URL: http://svn.apache.org/r1504455
Log:
avoiding NPE when cleaning up rest servlets

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

Modified: 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1504455&r1=1504454&r2=1504455&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
 Thu Jul 18 13:07:17 2013
@@ -184,9 +184,11 @@ public class OpenEJBContextConfig extend
             for (final String clazz : webAppInfo.restApplications) {
                 final Container child = mappedChildren.get(clazz);
                 try { // remove only "fake" servlets to let users use their 
own stuff
-                    final String servletClass = 
StandardWrapper.class.cast(child).getServletClass();
-                    if (child != null && 
("org.apache.openejb.server.rest.OpenEJBRestServlet".equals(servletClass) || 
!HttpServlet.class.isAssignableFrom(info.loader().loadClass(servletClass)))) {
-                        context.removeChild(child);
+                    if (child != null) {
+                        final String servletClass = 
StandardWrapper.class.cast(child).getServletClass();
+                        if 
("org.apache.openejb.server.rest.OpenEJBRestServlet".equals(servletClass) || 
!HttpServlet.class.isAssignableFrom(info.loader().loadClass(servletClass))) {
+                            context.removeChild(child);
+                        }
                     }
                 } catch (final NoClassDefFoundError e) {
                     context.removeChild(child);