Merge pull request #8024 from deathbeam/fix-config-load

Null-check remote configuration in config manager
This commit is contained in:
Tomas Slusny
2019-03-01 08:09:23 +00:00
committed by GitHub

View File

@@ -155,7 +155,7 @@ public class ConfigManager
return;
}
if (configuration.getConfig().isEmpty())
if (configuration.getConfig() == null || configuration.getConfig().isEmpty())
{
log.debug("No configuration from client, using saved configuration on disk");
loadFromFile();