Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -220,13 +220,19 @@ private <T> T convertOrDefault(String value, T defaultValue) {
*/
private boolean loadFrom(String name, Function<String, String> loader, String logMessage) {
String value = loader.apply(name);
if (!ImplUtils.isNullOrEmpty(value) && !value.equals(configurations.get(name))) {

if (value == null) {
// Nothing was loaded
return false;
} else if (value.equals(configurations.get(name))) {
// Value loaded is the same, no need to log anything.
return true;
} else {
// Value changed, log it!
configurations.put(name, value);
logger.info(logMessage, name, value);
return true;
}

return false;
}

/*
Expand Down