Author: nbubna
Date: Wed Nov 29 22:20:01 2006
New Revision: 480851
URL: http://svn.apache.org/viewvc?view=rev&rev=480851
Log:
improve default error message by including request path and html-escaping the
exception
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java?view=diff&rev=480851&r1=480850&r2=480851
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
Wed Nov 29 22:20:01 2006
@@ -35,6 +35,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.collections.ExtendedProperties;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.velocity.Template;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
@@ -756,14 +757,16 @@
html.append("<html>\n");
html.append("<head><title>Error</title></head>\n");
html.append("<body>\n");
- html.append("<h2>VelocityViewServlet : Error processing the
template</h2>\n");
+ html.append("<h2>VelocityViewServlet : Error processing a template
for path '");
+ html.append(ServletUtils.getPath(request));
+ html.append("'</h2>\n");
Throwable cause = e;
String why = cause.getMessage();
if (why != null && why.trim().length() > 0)
{
- html.append(why);
+ html.append(StringEscapeUtils.escapeHtml(why));
html.append("\n<br>\n");
}
@@ -778,7 +781,7 @@
cause.printStackTrace(new PrintWriter(sw));
html.append("<pre>\n");
- html.append(sw.toString());
+ html.append(StringEscapeUtils.escapeHtml(sw.toString()));
html.append("</pre>\n");
html.append("</body>\n");
html.append("</html>");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
