tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r491603 - in /tomcat/tc6.0.x/trunk: java/org/apache/jasper/servlet/JspServletWrapper.java webapps/docs/changelog.xml
Date Mon, 01 Jan 2007 17:56:47 GMT
Author: markt
Date: Mon Jan  1 09:56:46 2007
New Revision: 491603

URL: http://svn.apache.org/viewvc?view=rev&rev=491603
Log:
Port fix from TC5 for displaying JSP source after an exception in an included file

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?view=diff&rev=491603&r1=491602&r2=491603
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Mon Jan  1
09:56:46 2007
@@ -520,7 +520,7 @@
 
                     // 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()));

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=491603&r1=491602&r2=491603
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jan  1 09:56:46 2007
@@ -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>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message