You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2011/02/28 12:03:05 UTC
svn commit: r1075287 -
/lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/XMLErrorLogger.java
Author: uschindler
Date: Mon Feb 28 11:03:05 2011
New Revision: 1075287
URL: http://svn.apache.org/viewvc?rev=1075287&view=rev
Log:
SOLR-2388: Fix possible NPE, fix indent
Modified:
lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/XMLErrorLogger.java
Modified: lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/XMLErrorLogger.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/XMLErrorLogger.java?rev=1075287&r1=1075286&r2=1075287&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/XMLErrorLogger.java (original)
+++ lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/XMLErrorLogger.java Mon Feb 28 11:03:05 2011
@@ -28,45 +28,50 @@ import javax.xml.stream.Location;
import javax.xml.stream.XMLReporter;
public final class XMLErrorLogger implements ErrorHandler,ErrorListener,XMLReporter {
-
+
private final Logger log;
public XMLErrorLogger(Logger log) {
this.log = log;
}
-
+
// ErrorHandler
-
- public void warning(SAXParseException e) {
- log.warn("XML parse warning in \""+e.getSystemId()+"\", line "+e.getLineNumber()+", column "+e.getColumnNumber()+": "+e.getMessage());
- }
-
- public void error(SAXParseException e) throws SAXException {
- throw e;
- }
-
- public void fatalError(SAXParseException e) throws SAXException {
- throw e;
- }
-
+
+ public void warning(SAXParseException e) {
+ log.warn("XML parse warning in \""+e.getSystemId()+"\", line "+e.getLineNumber()+", column "+e.getColumnNumber()+": "+e.getMessage());
+ }
+
+ public void error(SAXParseException e) throws SAXException {
+ throw e;
+ }
+
+ public void fatalError(SAXParseException e) throws SAXException {
+ throw e;
+ }
+
// ErrorListener
-
- public void warning(TransformerException e) {
- log.warn(e.getMessageAndLocation());
- }
-
- public void error(TransformerException e) throws TransformerException {
- throw e;
- }
-
- public void fatalError(TransformerException e) throws TransformerException {
- throw e;
- }
-
+
+ public void warning(TransformerException e) {
+ log.warn(e.getMessageAndLocation());
+ }
+
+ public void error(TransformerException e) throws TransformerException {
+ throw e;
+ }
+
+ public void fatalError(TransformerException e) throws TransformerException {
+ throw e;
+ }
+
// XMLReporter
-
+
public void report(String message, String errorType, Object relatedInformation, Location loc) {
- log.warn("XML parse warning in \""+loc.getSystemId()+"\", line "+loc.getLineNumber()+", column "+loc.getColumnNumber()+": "+message);
+ final StringBuilder sb = new StringBuilder("XML parser reported ").append(errorType);
+ if (loc != null) {
+ sb.append(" in \"").append(loc.getSystemId()).append("\", line ")
+ .append(loc.getLineNumber()).append(", column ").append(loc.getColumnNumber());
+ }
+ log.warn(sb.append(": ").append(message).toString());
}
-
+
}