luehe 2002/11/04 12:18:24
Modified: jasper2/src/share/org/apache/jasper/compiler
ErrorDispatcher.java
Log:
Closed 14195: NPE from dispatch() when no errCode
Revision Changes Path
1.6 +6 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorDispatcher.java
Index: ErrorDispatcher.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorDispatcher.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ErrorDispatcher.java 7 Oct 2002 19:37:21 -0000 1.5
+++ ErrorDispatcher.java 4 Nov 2002 20:18:24 -0000 1.6
@@ -415,9 +415,11 @@
boolean hasLocation = false;
// Localize
-
if (errCode != null) {
errMsg = getString(errCode, args);
+ } else if (e != null) {
+ // give a hint about what's wrong
+ errMsg = e.getMessage();
}
// Get error location
--
To unsubscribe, e-mail: <mailto:tomcat-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@;jakarta.apache.org>
