Merge branch '4.16'

This commit is contained in:
nvazquez 2022-04-19 17:11:56 -03:00
commit 7ea0dea479
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84

View File

@ -1057,7 +1057,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
s_logger.error("Failed to reset configuration option, name: " + name + ", defaultValue:" + defaultValue);
throw new CloudRuntimeException("Failed to reset configuration value. Please contact Cloud Support.");
}
optionalValue = Optional.ofNullable(configKey != null ? configKey.value() : config.getValue());
optionalValue = Optional.ofNullable(configKey != null ? configKey.value() : _configDao.findByName(name).getValue());
newValue = optionalValue.isPresent() ? optionalValue.get().toString() : defaultValue;
}