Skip to content

Commit

Permalink
Crash with NullPointerException while validating an MRC file #356: us…
Browse files Browse the repository at this point in the history
…e explicit UTF-8 instead of the default charset when writing to file.
  • Loading branch information
pkiraly committed Nov 13, 2023
1 parent 589b99f commit 0e1ab0b
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import java.io.IOException;
import java.io.Serializable;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -93,7 +94,7 @@ public void processRecord(BibliographicRecord marcRecord, int recordNumber) thro

private void print(String message) {
try {
FileUtils.writeStringToFile(output, message, Charset.defaultCharset(), true);
FileUtils.writeStringToFile(output, message, StandardCharsets.UTF_8, true);
} catch (IOException e) {
logger.log(Level.WARNING, "print", e);
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/de/gwdg/metadataqa/marc/cli/DataElements.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.io.IOException;
import java.io.Serializable;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -125,7 +126,7 @@ public void afterIteration(int numberOfprocessedRecords, long duration) {

private void printToFile(File file, String message) {
try {
FileUtils.writeStringToFile(file, message, Charset.defaultCharset(), true);
FileUtils.writeStringToFile(file, message, StandardCharsets.UTF_8, true);
} catch (IOException e) {
if (parameters.doLog())
logger.log(Level.SEVERE, "printToFile", e);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/gwdg/metadataqa/marc/cli/QACli.java
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ protected File prepareReportFile(String outputDir, String fileName) {
*/
protected void printToFile(File file, String content) {
try {
FileUtils.writeStringToFile(file, content, Charset.defaultCharset(), true);
FileUtils.writeStringToFile(file, content, StandardCharsets.UTF_8, true);
} catch (IOException e) {
if (parameters.doLog())
logger.log(Level.SEVERE, "printToFile", e);
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/de/gwdg/metadataqa/marc/cli/SerialScore.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.io.IOException;
import java.io.Serializable;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
Expand Down Expand Up @@ -173,7 +174,7 @@ public void printHelp(Options options) {

private void print(String message) {
try {
FileUtils.writeStringToFile(output, message, Charset.defaultCharset(), true);
FileUtils.writeStringToFile(output, message, StandardCharsets.UTF_8, true);
} catch (IOException e) {
logger.log(Level.SEVERE, "print", e);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.io.IOException;
import java.io.Serializable;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
Expand Down Expand Up @@ -164,7 +165,7 @@ public void printHelp(Options options) {

private void print(String message) {
try {
FileUtils.writeStringToFile(output, message, Charset.defaultCharset(), true);
FileUtils.writeStringToFile(output, message, StandardCharsets.UTF_8, true);
} catch (IOException e) {
logger.log(Level.WARNING, "print", e);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.io.IOException;
import java.io.Serializable;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
Expand Down Expand Up @@ -151,7 +152,7 @@ public void printHelp(Options options) {

private void print(String message) {
try {
FileUtils.writeStringToFile(output, message, Charset.defaultCharset(), true);
FileUtils.writeStringToFile(output, message, StandardCharsets.UTF_8, true);
} catch (IOException e) {
logger.log(Level.SEVERE, "print", e);
}
Expand Down

0 comments on commit 0e1ab0b

Please sign in to comment.