opendev/gerrit
Code Issues Proposed changes

Merge "Support null as default value when getting string from plugin config"

Browse Source
This commit is contained in:
Edwin Kempin
2013-11-24 07:59:37 +00:00
committed by Gerrit Code Review
parent cd9e0a2d5b 077a4af912
commit 108292a6d0
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-server/src/main/java/com/google/gerrit/server/config/PluginConfig.java
View File

@@ -69,7 +69,11 @@ public class PluginConfig {
}
public String getString(String name, String defaultValue) {
return Objects.firstNonNull(cfg.getString(PLUGIN, pluginName, name), defaultValue);
if (defaultValue == null) {
return cfg.getString(PLUGIN, pluginName, name);
} else {
return Objects.firstNonNull(cfg.getString(PLUGIN, pluginName, name), defaultValue);
}
}
public String[] getStringList(String name) {