honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#23391: simplify setting fallback (missing in the squash commit)

This commit is contained in:
Jim Ferenczi 2017-02-28 11:33:42 +01:00
parent 33eb6a13bf
commit 0c03d0056c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/elasticsearch/common/settings/Setting.java
View File

@ -376,12 +376,12 @@ public class Setting<T> extends ToXContentToBytes {
if (exists(primary)) {
return get(primary);
}
if (fallbackSetting == null) {
return exists(secondary) ? get(secondary) : get(primary);
}
if (exists(secondary)) {
return get(secondary);
}
if (fallbackSetting == null) {
return get(primary);
}
if (fallbackSetting.exists(primary)) {
return fallbackSetting.get(primary);
}