From c8687b7c4886d6cb8b3760ba96bda259fc7992d8 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sat, 30 Mar 2019 11:04:51 +0200 Subject: [PATCH] Fixed ConfigReader sometimes adding empty string to a null value. --- .../djrapitops/plan/system/settings/config/ConfigNode.java | 7 +------ .../plan/system/settings/config/ConfigReader.java | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/ConfigNode.java b/Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/ConfigNode.java index 7d20a7b2b..a10cdc6a3 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/ConfigNode.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/ConfigNode.java @@ -365,11 +365,6 @@ public class ConfigNode { @Override public String toString() { - return "ConfigNode{" + - "key='" + key + '\'' + - ", nodeOrder=" + nodeOrder + - ", comment=" + comment + - ", value='" + value + '\'' + - '}'; + return "{'" + value + "' " + (!childNodes.isEmpty() ? childNodes : "") + '}'; } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/ConfigReader.java b/Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/ConfigReader.java index ed473b74f..f10b8d707 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/ConfigReader.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/ConfigReader.java @@ -150,7 +150,7 @@ public class ConfigReader implements Closeable { } String key = keyAndValue[0].trim(); String value = keyAndValue[1].trim(); - return handleNewNode(key, value); + return handleNewNode(key, !value.isEmpty() ? value : null); } private ConfigNode handleMultiline(String line) {