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/16 01:47:17 UTC
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler Compiler.java
craigmcc 01/09/15 16:47:17
Modified: . RELEASE-NOTES-4.0.txt RELEASE-PLAN-4.0.txt
jasper/src/share/org/apache/jasper/compiler Compiler.java
Log:
Remove a spurious "nulL" from an error message when findMapping() returns
null because it could not get a match.
PR: Bugzilla #3617.
Submitted by: Martijn Koster <ma...@greenhills.co.uk>
Revision Changes Path
1.2 +10 -1 jakarta-tomcat-4.0/RELEASE-NOTES-4.0.txt
Index: RELEASE-NOTES-4.0.txt
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/RELEASE-NOTES-4.0.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RELEASE-NOTES-4.0.txt 2001/09/15 18:17:44 1.1
+++ RELEASE-NOTES-4.0.txt 2001/09/15 23:47:16 1.2
@@ -3,7 +3,7 @@
Release Notes
=============
-$Id: RELEASE-NOTES-4.0.txt,v 1.1 2001/09/15 18:17:44 craigmcc Exp $
+$Id: RELEASE-NOTES-4.0.txt,v 1.2 2001/09/15 23:47:16 craigmcc Exp $
============
@@ -74,13 +74,22 @@
created for an HTTP status code. This was causing problems for Netscape
Navigator when handling 302 redirects.
+StandardContext: If a problem occurs during application startup (the start()
+method), call stop() so that a web application is not left in a partly started
+state. Among other things, this allows you to restart the app from the
+Manager web application after correcting the problem that caused the startup
+to fail.
+
----------------
Jasper Bug Fixes:
----------------
Parser: Fix a bug that was causing null pointer exceptions in
JakartaCommentGenerator.
+
+Compiler: Remove a spurious "null" in an error message when no mapping back
+to the original source file can be performed.
-----------------
1.20 +1 -7 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- RELEASE-PLAN-4.0.txt 2001/09/15 18:17:44 1.19
+++ RELEASE-PLAN-4.0.txt 2001/09/15 23:47:17 1.20
@@ -1,4 +1,4 @@
-$Id: RELEASE-PLAN-4.0.txt,v 1.19 2001/09/15 18:17:44 craigmcc Exp $
+$Id: RELEASE-PLAN-4.0.txt,v 1.20 2001/09/15 23:47:17 craigmcc Exp $
Release Plan for Apache Tomcat 4.0
==================================
@@ -46,8 +46,6 @@
Bugs That Must Be Addressed Before Final Release:
------------------------------------------------
-Catalina 3614 Bug in manager webapp
-
Connectors 2997 Webapp connector should recover when Tomcat is restarted
Connectors 3476 Cannot use other than default context when using mod_webapp
@@ -57,13 +55,9 @@
Connectors 3534 File Upload doesn't work with Apache, mod_webapp, Tomcat 4
-Jasper 3617 "null" in JasperException
-
Nice To Have Fixes Before Final Release:
---------------------------------------
-
-Connectors 3570 Info page reporting wrong server port
Jasper 3055 <jsp:plugin> tag ignores the name attribute
1.12 +9 -6 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java
Index: Compiler.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Compiler.java 2001/07/20 00:32:36 1.11
+++ Compiler.java 2001/09/15 23:47:17 1.12
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v 1.11 2001/07/20 00:32:36 craigmcc Exp $
- * $Revision: 1.11 $
- * $Date: 2001/07/20 00:32:36 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v 1.12 2001/09/15 23:47:17 craigmcc Exp $
+ * $Revision: 1.12 $
+ * $Date: 2001/09/15 23:47:17 $
*
* ====================================================================
*
@@ -323,9 +323,12 @@
//System.out.println("lineNr: " + lineNr);
// Now do the mapping
- errorMsg.append(findMapping(map, lineNr));
- errorMsg.append(line);
- errorMsg.append('\n');
+ String mapping = findMapping(map, lineNr);
+ if (mapping != null) {
+ errorMsg.append(findMapping(map, lineNr));
+ errorMsg.append(line);
+ errorMsg.append('\n');
+ }
}
br.close();
map.clear();