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...@locus.apache.org on 2000/05/04 23:37:22 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/jasper/compiler JspReader.java
mandar 00/05/04 14:37:22
Modified: src/share/org/apache/jasper/compiler JspReader.java
Log:
Bug Fix [309]: Patch submitted by Phil Hanna (phanna@ipass.net)
Generating correct file name in the generated servlet.
Revision Changes Path
1.15 +6 -1 jakarta-tomcat/src/share/org/apache/jasper/compiler/JspReader.java
Index: JspReader.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspReader.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JspReader.java 2000/04/24 22:53:12 1.14
+++ JspReader.java 2000/05/04 21:37:21 1.15
@@ -164,7 +164,12 @@
}
// Register the file, and read its content:
- int fileid = registerSourceFile(file.getAbsolutePath());
+ String longName = (context == null)
+ ? file.getAbsolutePath()
+ : context.getRealPath(file.toString());
+
+ int fileid = registerSourceFile(longName);
+
if (fileid == -1)
throw new ParseException(Constants.getString("jsp.error.file.already.registered",
new Object[] {