Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for #3959, guard against NPE #3960

Merged
merged 1 commit into from Aug 2, 2022
Merged

Fix for #3959, guard against NPE #3960

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 15 additions & 12 deletions src/main/java/org/dita/dost/util/XMLUtils.java
View file
Open in desktop
Expand Up @@ -9,11 +9,11 @@

import com.google.common.annotations.VisibleForTesting;
import net.sf.saxon.expr.instruct.TerminationException;
import net.sf.saxon.lib.*;
import net.sf.saxon.lib.CollationURIResolver;
import net.sf.saxon.lib.ErrorReporter;
import net.sf.saxon.lib.ExtensionFunctionDefinition;
import net.sf.saxon.s9api.*;
import net.sf.saxon.s9api.streams.Predicates;
import net.sf.saxon.s9api.streams.Step;
import net.sf.saxon.s9api.streams.XdmStream;
import org.apache.xml.resolver.tools.CatalogResolver;
import org.dita.dost.exception.DITAOTException;
import org.dita.dost.log.DITAOTLogger;
Expand Down Expand Up @@ -197,15 +197,18 @@ public static ErrorReporter toErrorReporter(final DITAOTLogger logger) {
logger.warn(error.getMessage());
} else {
if (error.getCause() instanceof FileNotFoundException) {
error.asWarning();
final StringBuilder buf = new StringBuilder()
.append(error.getLocation().getSystemId())
.append(":")
.append(error.getLocation().getLineNumber())
.append(":")
.append(error.getLocation().getColumnNumber())
.append(": ")
.append(error.getMessage());
error = error.asWarning();
final StringBuilder buf = new StringBuilder();
final Location location = error.getLocation();
if (location != null) {
buf.append(location.getSystemId())
.append(":")
.append(location.getLineNumber())
.append(":")
.append(location.getColumnNumber())
.append(": ");
}
buf.append(error.getMessage());
logger.warn(buf.toString());
} else {
logger.error(error.getMessage());
Expand Down