mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Merge branch '4.16'
This commit is contained in:
commit
7ea0dea479
@ -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;
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user