You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by Konstantin Kolinko <kn...@gmail.com> on 2012/08/12 02:57:55 UTC
Re: svn commit: r1371995 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java
test/org/apache/catalina/startup/TestContextConfig.java test/webapp-3.0/WEB-INF/jsp/
test/webapp-3.0/WEB-INF/jsp/bug53574.jsp test/webapp-3.0/WEB-INF/web
2012/8/11 <ma...@apache.org>:
> Author: markt
> Date: Sat Aug 11 18:54:53 2012
> New Revision: 1371995
>
> URL: http://svn.apache.org/viewvc?rev=1371995&view=rev
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53574
> Ensure Servlets defined using jsp-file are available when metadata-complete is true.
>
> Added:
> tomcat/trunk/test/webapp-3.0/WEB-INF/jsp/
> tomcat/trunk/test/webapp-3.0/WEB-INF/jsp/bug53574.jsp
> Modified:
> tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
> tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java
> tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml
>
> Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1371995&r1=1371994&r2=1371995&view=diff
> ==============================================================================
> --- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Sat Aug 11 18:54:53 2012
> @@ -1245,6 +1245,7 @@ public class ContextConfig implements Li
> }
> } else {
> webXml.merge(defaults);
> + convertJsps(webXml);
> webXml.configureContext(context);
What about "Step 9a. Make the merged web.xml available to other
components, specifically Jasper, (...)" from the main
"if(!webXml.isMetadataComplete())" branch?
Shouldn't it be invoked in this case as well?
I think it is possible to move the whole "step 9" to below the else{}
block, so that it were invoked in either case.
> }
>
>
Best regards,
Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org