Author: markt
Date: Tue May 30 08:44:11 2017
New Revision: 1796806
URL: http://svn.apache.org/viewvc?rev=1796806&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=44787
Improve error message when JSP compiler configuration options are not valid.
Modified:
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=1796806&r1=1796805&r2=1796806&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Tue May 30
08:44:11 2017
@@ -232,7 +232,8 @@ public class JspCompilationContext {
}
}
if (jspCompiler == null) {
- throw new
IllegalStateException(Localizer.getMessage("jsp.error.compiler"));
+ throw new
IllegalStateException(Localizer.getMessage("jsp.error.compiler.config",
+ options.getCompilerClassName(), options.getCompiler()));
}
jspCompiler.init(this, jsw);
return jspCompiler;
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1796806&r1=1796805&r2=1796806&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Tue
May 30 08:44:11 2017
@@ -17,6 +17,7 @@
# Localized this the Default Locale as is en_US
jsp.error.compiler=No Java compiler available
+jsp.error.compiler.config=No Java compiler available for configuration options
compilerClassName: [{0}] and compiler: [{1}]
jsp.error.no.scratch.dir=The JSP engine is not configured with a scratch dir.\
\n Please add "jsp.initparams=scratchdir=<dir-name>" \
\n in the servlets.properties file for this context.
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1796806&r1=1796805&r2=1796806&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue May 30 08:44:11 2017
@@ -88,6 +88,10 @@
<subsection name="Jasper">
<changelog>
<fix>
+ <bug>44787</bug>: Improve error message when JSP compiler configuration
+ options are not valid. (markt)
+ </fix>
+ <fix>
<bug>53011</bug>: When pre-compiling with JspC, report all compilation
errors rather than stopping after the first error. A new option
<code>-failFast</code> can be used to restore the previous behaviour of
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
