fix npe during sort

probakowski · Apr 8, 2020 · 9f3732a · 9f3732a
1 parent f4fcdc8
commit 9f3732a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateService.java
@@ -690,7 +690,7 @@ public static String findV2Template(Metadata metadata, String indexName, @Nullab
         }
 
         final List<IndexTemplateV2> candidates = new ArrayList<>(matchedTemplates.keySet());
-        CollectionUtil.timSort(candidates, Comparator.comparingLong(IndexTemplateV2::priority).reversed());
+        CollectionUtil.timSort(candidates, Comparator.nullsFirst(Comparator.comparingLong(IndexTemplateV2::priority).reversed()));
 
         assert candidates.size() > 0 : "we should have returned early with no candidates";
         IndexTemplateV2 winner = candidates.get(0);