Fixed NPE when converting old settings

FraunhoferIOSB · Jan 9, 2023 · 1250efc · 1250efc
1 parent 66db7de
commit 1250efc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@ FROST-Server version 2.1 and higher requires Java 17. This is because some libra
 * Fixed #1246: phenomenonTime not serialised in CSV ResultFormatter.
 * Fixed NPE in auth module on DatabaseStatus path.
 * Improved consistency of 4xx logging. (pbaumard)
+* Fixed handling of default settings.
 
 
 ## Release version 2.0.0

diff --git a/...rver.Core/src/main/java/de/fraunhofer/iosb/ilt/frostserver/settings/SettingsMigrator.java b/...rver.Core/src/main/java/de/fraunhofer/iosb/ilt/frostserver/settings/SettingsMigrator.java
@@ -80,6 +80,9 @@ public void migrateOldSettings(Properties properties) {
 
     private void migrateOldSettings(Properties properties, String key, Map<String, ReplaceList> replaces) {
         String oldValue = properties.getProperty(key);
+        if (oldValue == null) {
+            return;
+        }
         ReplaceList newValues = replaces.get(oldValue);
         if (newValues != null) {
             LOGGER.warn("Converting settings of key '{}' with old value '{}'", key, oldValue);