Author: cziegeler
Date: Mon Aug 14 09:47:04 2017
New Revision: 1804961
URL: http://svn.apache.org/viewvc?rev=1804961&view=rev
Log:
SLING-6517 : A condition that is always true.
Modified:
sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/TraxErrorHandler.java
Modified:
sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/TraxErrorHandler.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/TraxErrorHandler.java?rev=1804961&r1=1804960&r2=1804961&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/TraxErrorHandler.java
(original)
+++
sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/TraxErrorHandler.java
Mon Aug 14 09:47:04 2017
@@ -38,6 +38,7 @@ public class TraxErrorHandler implements
this.logger = logger;
}
+ @Override
public void warning(TransformerException exception)
throws TransformerException {
final String message = getMessage(exception);
@@ -51,6 +52,7 @@ public class TraxErrorHandler implements
warnings.append("\n");
}
+ @Override
public void error(TransformerException exception)
throws TransformerException {
final String message = getMessage(exception);
@@ -64,6 +66,7 @@ public class TraxErrorHandler implements
warnings.append("\n");
}
+ @Override
public void fatalError(TransformerException exception)
throws TransformerException {
final String message = getMessage(exception);
@@ -83,13 +86,13 @@ public class TraxErrorHandler implements
}
}
- private String getMessage(TransformerException exception) {
- SourceLocator locator = exception.getLocator();
+ private String getMessage(final TransformerException exception) {
+ final SourceLocator locator = exception.getLocator();
if (locator != null) {
- String id = (!locator.getPublicId().equals(locator.getPublicId()))
+ final String id = locator.getPublicId() != null
? locator.getPublicId()
: (null != locator.getSystemId())
- ? locator.getSystemId() : "SystemId Unknown";
+ ? locator.getSystemId() : "SystemId Unknown";
return "File " + id
+ "; Line " + locator.getLineNumber()
+ "; Column " + locator.getColumnNumber()
