kinman 02/01/04 13:32:13
Modified: jasper/src/share/org/apache/jasper/compiler Tag:
tomcat_40_branch JspReader.java
Log:
- Removal of '\n' at eof is a spec no-no.
Revision Changes Path
No revision
No revision
1.6.2.2 +1 -8
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspReader.java
Index: JspReader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspReader.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- JspReader.java 12 Dec 2001 01:28:39 -0000 1.6.2.1
+++ JspReader.java 4 Jan 2002 21:32:13 -0000 1.6.2.2
@@ -332,14 +332,7 @@
*/
public boolean hasMoreInput() throws ParseException {
- // An extra '\n' seems to be inserted when there is none at end of
- // a file. Not only is this useless, but it causes problems when
- // none is expected (e.g. after response.sendRedirect() ).
-
- if (current.cursor >= current.stream.length ||
- ((current.cursor == current.stream.length - 1) &&
- (peekChar() == '\n'))) {
-
+ if (current.cursor >= current.stream.length) {
if (singleFile) return false;
while (popFile()) {
if (current.cursor < current.stream.length) return true;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
