You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by xu...@apache.org on 2010/09/26 11:04:52 UTC

svn commit: r1001395 - /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/core/GeronimoApplicationContext.java

Author: xuhaihong
Date: Sun Sep 26 09:04:52 2010
New Revision: 1001395

URL: http://svn.apache.org/viewvc?rev=1001395&view=rev
Log:
Fix NPE for createServlet method, we only record the servlet instance when web.xml processing is finished and security store is not null

Modified:
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/core/GeronimoApplicationContext.java

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/core/GeronimoApplicationContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/core/GeronimoApplicationContext.java?rev=1001395&r1=1001394&r2=1001395&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/core/GeronimoApplicationContext.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/core/GeronimoApplicationContext.java Sun Sep 26 09:04:52 2010
@@ -78,7 +78,7 @@ public class GeronimoApplicationContext 
     @Override
     public <T extends Servlet> T createServlet(Class<T> c) throws ServletException  {
         T servlet = super.createServlet(c);
-        if (!context.getConfigured() || webSecurityConstraintStore == null) {
+        if (context.getConfigured() && webSecurityConstraintStore != null) {
             webSecurityConstraintStore.addContainerCreatedDynamicServlet(servlet);
         }
         return servlet;