Author: markt
Date: Sun Jun 24 04:47:34 2007
New Revision: 550211
URL: http://svn.apache.org/viewvc?view=rev&rev=550211
Log:
Fix bug 42314 by porting changes from TC6.
Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/resources/LocalStrings.properties
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=550211&r1=550210&r2=550211
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jun 24 04:47:34 2007
@@ -39,6 +39,10 @@
<bug>42643</bug>: Prevent creation of duplicate JSP function mapper
variables. (markt)
</fix>
+ <fix>
+ <bug>42314</bug>: Provide compilation error details in cases where the
+ error can't be mapped back to a source file. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Webapps">
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java?view=diff&rev=550211&r1=550210&r2=550211
==============================================================================
---
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java
(original)
+++
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java
Sun Jun 24 04:47:34 2007
@@ -79,6 +79,14 @@
buf.append(details[i].getErrorMessage());
buf.append("\n");
buf.append(details[i].getJspExtract());
+ } else {
+ args = new Object[] {
+ new Integer(details[i].getJavaLineNumber()) };
+ buf.append("\n\n");
+ buf.append(Localizer.getMessage("jsp.error.java.line.number",
+ args));
+ buf.append("\n");
+ buf.append(details[i].getErrorMessage());
}
}
buf.append("\n\nStacktrace:");
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/resources/LocalStrings.properties?view=diff&rev=550211&r1=550210&r2=550211
==============================================================================
---
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/resources/LocalStrings.properties
(original)
+++
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/resources/LocalStrings.properties
Sun Jun 24 04:47:34 2007
@@ -301,6 +301,7 @@
#Error when compiling, used for jsp line number error messages
jsp.error.single.line.number=An error occurred at line: {0} in the jsp file:
{1}
jsp.error.multiple.line.number=\n\nAn error occurred between lines: {0} and
{1} in the jsp file: {2}\n\n
+jsp.error.java.line.number=An error occurred at line: {0} in the generated
java file
jsp.error.corresponding.servlet=Generated servlet error:\n
jsp.error.empty.body.not.allowed=Empty body not allowed for {0}
jsp.error.jspbody.required=Must use jsp:body to specify tag body for {0} if
jsp:attribute is used.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
