From: markt Date: Mon, 1 Jan 2007 17:56:46 +0000 (+0000) Subject: Port fix from TC5 for displaying JSP source after an exception in an included file X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=d8c46a7f40d547f47e2ae28da1006dc252d164c1;p=tomcat7.0 Port fix from TC5 for displaying JSP source after an exception in an included file git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@491603 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/jasper/servlet/JspServletWrapper.java b/java/org/apache/jasper/servlet/JspServletWrapper.java index d5ccfa2d3..68cfeac08 100644 --- a/java/org/apache/jasper/servlet/JspServletWrapper.java +++ b/java/org/apache/jasper/servlet/JspServletWrapper.java @@ -520,7 +520,7 @@ public class JspServletWrapper { // Read both files in, so we can inspect them String[] jspLines = readFile - (this.ctxt.getResourceAsStream(this.ctxt.getJspFile())); + (this.ctxt.getResourceAsStream(detail.getJspFileName())); String[] javaLines = readFile (new FileInputStream(this.ctxt.getServletJavaFileName())); diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index c9b810697..e0f146f48 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -14,6 +14,16 @@ +

+ + + + When displaying JSP source after an exception, handle included files. + (markt) + + + +