carnold 2005/07/30 17:02:58
Modified: docs Tag: v1_2-branch HISTORY.txt
src/java/org/apache/log4j/xml Tag: v1_2-branch
SAXErrorHandler.java
Log:
Bug 35947: DOMConfiguration reports XML validation errors using LogLog.error
Revision Changes Path
No revision
No revision
1.27.2.12 +4 -0 logging-log4j/docs/HISTORY.txt
Index: HISTORY.txt
===================================================================
RCS file: /home/cvs/logging-log4j/docs/HISTORY.txt,v
retrieving revision 1.27.2.11
retrieving revision 1.27.2.12
diff -u -r1.27.2.11 -r1.27.2.12
--- HISTORY.txt 29 Jul 2005 03:36:44 -0000 1.27.2.11
+++ HISTORY.txt 31 Jul 2005 00:02:58 -0000 1.27.2.12
@@ -56,6 +56,10 @@
- Fixed bug 34026, SyslogAppender now checks Layout.ignoresThrowable() just
like every other appender.
+ - Fixed bug 35947 whereby DOMConfigurator would call LogLog.error to report
+ XML validation errors that caused no problems in the interpretation of
the
+ configuration file.
+
June 18th, 2005
- Release of version 1.2.11
No revision
No revision
1.2.2.2 +11 -12
logging-log4j/src/java/org/apache/log4j/xml/SAXErrorHandler.java
Index: SAXErrorHandler.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/xml/SAXErrorHandler.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- SAXErrorHandler.java 24 May 2005 05:06:24 -0000 1.2.2.1
+++ SAXErrorHandler.java 31 Jul 2005 00:02:58 -0000 1.2.2.2
@@ -23,24 +23,23 @@
public class SAXErrorHandler implements ErrorHandler {
public
- void error(SAXParseException ex) {
- LogLog.error("Parsing error on line "+ex.getLineNumber()+" and column "
- +ex.getColumnNumber());
- LogLog.error(ex.getMessage(), ex.getException());
- //LogLog.error("pid="+ex.getPublicId()+" sid="+ex.getSystemId());
+ void error(final SAXParseException ex) {
+ emitMessage("Continuable parsing error ", ex);
}
public
- void fatalError(SAXParseException ex) {
- error(ex);
+ void fatalError(final SAXParseException ex) {
+ emitMessage("Fatal parsing error ", ex);
}
public
- void warning(SAXParseException ex) {
- LogLog.warn("Parsing error on line "+ex.getLineNumber()+" and column "
- +ex.getColumnNumber());
+ void warning(final SAXParseException ex) {
+ emitMessage("Parsing warning ", ex);
+ }
+
+ private static void emitMessage(final String msg, final SAXParseException
ex) {
+ LogLog.warn(msg +ex.getLineNumber()+" and column "
+ +ex.getColumnNumber());
LogLog.warn(ex.getMessage(), ex.getException());
}
-
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
