You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@apache.org on 2001/09/15 03:18:10 UTC
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler Parser.java
craigmcc 01/09/14 18:18:10
Modified: . RELEASE-PLAN-4.0.txt
jasper/src/share/org/apache/jasper/compiler Parser.java
Log:
Fix NPE in JakartaCommentGenerator. Patch by Kin-Man Chung.
PR: Bugzilla #3079
Submitted by: Daniele Gaffuri <d....@reply.it>
Revision Changes Path
1.18 +1 -3 jakarta-tomcat-4.0/RELEASE-PLAN-4.0.txt
Index: RELEASE-PLAN-4.0.txt
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/RELEASE-PLAN-4.0.txt,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- RELEASE-PLAN-4.0.txt 2001/09/14 20:01:21 1.17
+++ RELEASE-PLAN-4.0.txt 2001/09/15 01:18:10 1.18
@@ -1,4 +1,4 @@
-$Id: RELEASE-PLAN-4.0.txt,v 1.17 2001/09/14 20:01:21 craigmcc Exp $
+$Id: RELEASE-PLAN-4.0.txt,v 1.18 2001/09/15 01:18:10 craigmcc Exp $
Release Plan for Apache Tomcat 4.0
==================================
@@ -54,8 +54,6 @@
(likely to be the same issue as 1788)
Connectors 3534 File Upload doesn't work with Apache, mod_webapp, Tomcat 4
-
-Jasper 3079 NullPointerException in JakartaCommentGenerator.generateEnd
Nice To Have Fixes Before Final Release:
1.13 +7 -1 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Parser.java 2001/07/12 23:29:31 1.12
+++ Parser.java 2001/09/15 01:18:10 1.13
@@ -1095,8 +1095,14 @@
boolean noJspElement = false;
while (reader.hasMoreInput()) {
- if (until != null && reader.matches(until))
+
+ if (until != null && reader.matches(until)) {
+ if (tmplStart == null)
+ tmplStart = reader.mark();
+ if (tmplStop == null)
+ tmplStop = reader.mark();
return;
+ }
// If the file has changed because of a 'push' or a 'pop'
// we must flush the character data for the old file.