Browse Source

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

Jim Ferenczi 8 years ago
parent
commit
0c03d0056c

+ 3 - 3
core/src/main/java/org/elasticsearch/common/settings/Setting.java

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