From f749715f1441708be486d9b7296529d0c135cf83 Mon Sep 17 00:00:00 2001 From: marhali Date: Thu, 3 Feb 2022 17:04:36 +0100 Subject: [PATCH] fix npe on files with no content --- CHANGELOG.md | 1 + .../marhali/easyi18n/io/parser/json/JsonParserStrategy.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7ba455..bd87015 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ ### Fixed - Character unescaping for '.properties' files +- Exception on json files without any content ## [2.0.0] ### BREAKING CHANGES diff --git a/src/main/java/de/marhali/easyi18n/io/parser/json/JsonParserStrategy.java b/src/main/java/de/marhali/easyi18n/io/parser/json/JsonParserStrategy.java index 67366a2..6511c1b 100644 --- a/src/main/java/de/marhali/easyi18n/io/parser/json/JsonParserStrategy.java +++ b/src/main/java/de/marhali/easyi18n/io/parser/json/JsonParserStrategy.java @@ -36,7 +36,9 @@ public class JsonParserStrategy extends ParserStrategy { try(Reader reader = new InputStreamReader(vf.getInputStream(), vf.getCharset())) { JsonObject input = GSON.fromJson(reader, JsonObject.class); - JsonMapper.read(file.getLocale(), input, targetNode); + if(input != null) { // @input is null if file is completely empty + JsonMapper.read(file.getLocale(), input, targetNode); + } } }