projects / tomcat7.0 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a8f2c19)
Port fix from TC5 for displaying JSP source after an exception in an included file
authormarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Mon, 1 Jan 2007 17:56:46 +0000 (17:56 +0000)
committermarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Mon, 1 Jan 2007 17:56:46 +0000 (17:56 +0000)
git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@491603 13f79535-47bb-0310-9956-ffa450edef68

java/org/apache/jasper/servlet/JspServletWrapper.java patch | blob | history
webapps/docs/changelog.xml patch | blob | history

diff --git a/java/org/apache/jasper/servlet/JspServletWrapper.java b/java/org/apache/jasper/servlet/JspServletWrapper.java
index d5ccfa2..68cfeac 100644 (file)
--- 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 c9b8106..e0f146f 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -14,6 +14,16 @@
   </properties>
 
 <body>
+<section name="Tomcat 6.0.8 (remm)">
+  <subsection name="Jasper">
+    <changelog>
+      <fix>
+        When displaying JSP source after an exception, handle included files.
+        (markt)
+      </fix>
+    </changelog>
+  </subsection>
+</section>
 <section name="Tomcat 6.0.7 (remm)">
   <subsection name="General">
     <changelog>
Unnamed repository; edit this file to name it for gitweb.