Skip to content

Commit 68719e1

Browse files
committed
avoiding NPE in getEffectiveSettings
1 parent 4c47be2 commit 68719e1

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,12 @@ public ComposableIndexTemplate getEffectiveIndexTemplate(ProjectMetadata project
381381

382382
public Settings getEffectiveSettings(ProjectMetadata projectMetadata) {
383383
ComposableIndexTemplate template = getMatchingIndexTemplate(projectMetadata);
384-
Settings templateSettings = template.template() == null ? Settings.EMPTY : template.template().settings();
384+
final Settings templateSettings;
385+
if (template.template() == null || template.template().settings() == null) {
386+
templateSettings = Settings.EMPTY;
387+
} else {
388+
templateSettings = template.template().settings();
389+
}
385390
return templateSettings.merge(settings);
386391
}
387392

0 commit comments

Comments
 (0)