Merge pull request #8024 from deathbeam/fix-config-load
Null-check remote configuration in config manager
This commit is contained in:
@@ -155,7 +155,7 @@ public class ConfigManager
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (configuration.getConfig().isEmpty())
|
if (configuration.getConfig() == null || configuration.getConfig().isEmpty())
|
||||||
{
|
{
|
||||||
log.debug("No configuration from client, using saved configuration on disk");
|
log.debug("No configuration from client, using saved configuration on disk");
|
||||||
loadFromFile();
|
loadFromFile();
|
||||||
|
|||||||
Reference in New Issue
Block a user