clean up logic

elastic · Jun 25, 2018 · dbb6319 · dbb6319
1 parent 3124312
commit dbb6319
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/AliasOrIndex.java b/server/src/main/java/org/elasticsearch/cluster/metadata/AliasOrIndex.java
@@ -154,15 +154,13 @@ void addIndex(IndexMetaData indexMetaData) {
         }
 
         public void computeAndValidateWriteIndex() {
-            final List<IndexMetaData> writeIndices;
-            if (referenceIndexMetaDatas.size() > 1) {
-                writeIndices = referenceIndexMetaDatas.stream()
-                    .filter(idxMeta -> Boolean.TRUE.equals(idxMeta.getAliases().get(aliasName).writeIndex()))
-                    .collect(Collectors.toList());
-            } else if(Boolean.FALSE.equals(referenceIndexMetaDatas.get(0).getAliases().get(aliasName).writeIndex()) == false) {
-                writeIndices = Collections.singletonList(referenceIndexMetaDatas.get(0));
-            } else {
-                writeIndices = Collections.emptyList();
+            List<IndexMetaData> writeIndices = referenceIndexMetaDatas.stream()
+                .filter(idxMeta -> Boolean.TRUE.equals(idxMeta.getAliases().get(aliasName).writeIndex()))
+                .collect(Collectors.toList());
+
+            if (writeIndices.isEmpty() && referenceIndexMetaDatas.size() == 1
+                    && referenceIndexMetaDatas.get(0).getAliases().get(aliasName).writeIndex() == null) {
+                writeIndices.add(referenceIndexMetaDatas.get(0));
             }
 
             if (writeIndices.size() == 1) {