You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2006/12/19 04:29:21 UTC

svn commit: r488515 - /tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/servlet/JspServletWrapper.java

Author: markt
Date: Mon Dec 18 19:29:20 2006
New Revision: 488515

URL: http://svn.apache.org/viewvc?view=rev&rev=488515
Log:
When displaying the JSP source for the error, handle the case of included files.

Modified:
    tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/servlet/JspServletWrapper.java

Modified: tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/servlet/JspServletWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/servlet/JspServletWrapper.java?view=diff&rev=488515&r1=488514&r2=488515
==============================================================================
--- tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/servlet/JspServletWrapper.java (original)
+++ tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/servlet/JspServletWrapper.java Mon Dec 18 19:29:20 2006
@@ -472,7 +472,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()));



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