kinman 2003/08/21 16:10:50
Modified: jasper2/src/share/org/apache/jasper/compiler
JspDocumentParser.java ErrorDispatcher.java
Log:
- Looks like when there is a SAX paser error, a null file name is always
reported. This fix get the file name from path instead of from the
expection.
Revision Changes Path
1.66 +7 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java
Index: JspDocumentParser.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- JspDocumentParser.java 15 Aug 2003 00:06:09 -0000 1.65
+++ JspDocumentParser.java 21 Aug 2003 23:10:49 -0000 1.66
@@ -193,7 +193,10 @@
} catch (IOException ioe) {
jspDocParser.err.jspError("jsp.error.data.file.read", path, ioe);
} catch (Exception e) {
- jspDocParser.err.jspError(e);
+ jspDocParser.err.jspError(
+ new Mark(path, ((SAXParseException) e).getLineNumber(),
+ ((SAXParseException) e).getColumnNumber()),
+ e.getMessage());
}
return pageNodes;
1.14 +3 -8
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ErrorDispatcher.java 14 Aug 2003 21:16:52 -0000 1.13
+++ ErrorDispatcher.java 21 Aug 2003 23:10:49 -0000 1.14
@@ -386,11 +386,6 @@
line = where.getLineNumber();
column = where.getColumnNumber();
hasLocation = true;
- } else if (e instanceof SAXParseException) {
- file = ((SAXParseException) e).getSystemId();
- line = ((SAXParseException) e).getLineNumber();
- column = ((SAXParseException) e).getColumnNumber();
- hasLocation = true;
}
// Get nested exception
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
