You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2013/01/10 12:54:51 UTC
svn commit: r1431302 - in /tomcat/trunk:
java/org/apache/jasper/servlet/JspServlet.java
test/webapp-3.0-fragments/WEB-INF/web.xml
Author: kkolinko
Date: Thu Jan 10 11:54:51 2013
New Revision: 1431302
URL: http://svn.apache.org/viewvc?rev=1431302&view=rev
Log:
Add name of JSP file to an error message in JspServlet.
Fix misconfiguration that caused
org.apache.catalina.core.TestStandardContextResources test to log this message,
javax.servlet.ServletException: missing jspFile
at org.apache.jasper.servlet.JspServlet.init(JspServlet.java:123)
at org.apache.catalina.core.StandardWrapper.initServlet(StandardWrapper.java:1228)
at org.apache.catalina.core.StandardWrapper.loadServlet(StandardWrapper.java:1141)
at org.apache.catalina.core.StandardWrapper.load(StandardWrapper.java:1037)
at org.apache.catalina.core.StandardContext.loadOnStartup(StandardContext.java:4851)
Modified:
tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java?rev=1431302&r1=1431301&r2=1431302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java Thu Jan 10 11:54:51 2013
@@ -120,7 +120,7 @@ public class JspServlet extends HttpServ
jspFile = config.getInitParameter("jspFile");
try {
if (null == context.getResource(jspFile)) {
- throw new ServletException("missing jspFile");
+ throw new ServletException("missing jspFile: [" + jspFile + "]");
}
} catch (MalformedURLException e) {
throw new ServletException("Can not locate jsp file", e);
Modified: tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml?rev=1431302&r1=1431301&r2=1431302&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml (original)
+++ tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml Thu Jan 10 11:54:51 2013
@@ -46,7 +46,7 @@
<!-- Bug 51396 -->
<servlet>
<servlet-name>bug51396</servlet-name>
- <jsp-file>/bug5nnnn/bug51396.jsp</jsp-file>
+ <jsp-file>/bug51396.jsp</jsp-file>
</servlet>
<post-construct>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1431302 - in /tomcat/trunk: java/org/apache/jasper/servlet/JspServlet.java
test/webapp-3.0-fragments/WEB-INF/web.xml
Posted by Konstantin Kolinko <kk...@apache.org>.
2013/1/10 <kk...@apache.org>:
> Author: kkolinko
> Date: Thu Jan 10 11:54:51 2013
> New Revision: 1431302
>
> URL: http://svn.apache.org/viewvc?rev=1431302&view=rev
> Log:
> Add name of JSP file to an error message in JspServlet.
> Fix misconfiguration that caused
> org.apache.catalina.core.TestStandardContextResources test to log this message,
> javax.servlet.ServletException: missing jspFile
> at org.apache.jasper.servlet.JspServlet.init(JspServlet.java:123)
> at org.apache.catalina.core.StandardWrapper.initServlet(StandardWrapper.java:1228)
> at org.apache.catalina.core.StandardWrapper.loadServlet(StandardWrapper.java:1141)
> at org.apache.catalina.core.StandardWrapper.load(StandardWrapper.java:1037)
> at org.apache.catalina.core.StandardContext.loadOnStartup(StandardContext.java:4851)
>
I am a bit wondering that the test for BZ 51396 did not fail.
The JspServlet failed to load at startup due to misconfiguration (with
the above exception), but the test passed because JspServlet loaded
successfully when bug51396.jsp was requested at run time.
> Modified:
> tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
> tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml
>
> Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java?rev=1431302&r1=1431301&r2=1431302&view=diff
> ==============================================================================
> --- tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java (original)
> +++ tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java Thu Jan 10 11:54:51 2013
> @@ -120,7 +120,7 @@ public class JspServlet extends HttpServ
> jspFile = config.getInitParameter("jspFile");
> try {
> if (null == context.getResource(jspFile)) {
> - throw new ServletException("missing jspFile");
> + throw new ServletException("missing jspFile: [" + jspFile + "]");
> }
> } catch (MalformedURLException e) {
> throw new ServletException("Can not locate jsp file", e);
>
> Modified: tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml
> URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml?rev=1431302&r1=1431301&r2=1431302&view=diff
> ==============================================================================
> --- tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml (original)
> +++ tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml Thu Jan 10 11:54:51 2013
> @@ -46,7 +46,7 @@
> <!-- Bug 51396 -->
> <servlet>
> <servlet-name>bug51396</servlet-name>
> - <jsp-file>/bug5nnnn/bug51396.jsp</jsp-file>
> + <jsp-file>/bug51396.jsp</jsp-file>
> </servlet>
>
> <post-construct>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org