From cbe39fb2f3a066c3ff6f3f0b31a9b95ebba089bc Mon Sep 17 00:00:00 2001
From: Martijn van Groningen <martijn.v.groningen@gmail.com>
Date: Tue, 28 Sep 2021 17:44:16 +0200
Subject: [PATCH] Fix a potential NPE in DataStreamAlias#toString()

---
 .../org/elasticsearch/cluster/metadata/DataStreamAlias.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamAlias.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamAlias.java
index 598cddd4e8e60..6c045bb09e842 100644
--- a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamAlias.java
+++ b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamAlias.java
@@ -329,7 +329,7 @@ public String toString() {
             "name='" + name + '\'' +
             ", dataStreams=" + dataStreams +
             ", writeDataStream='" + writeDataStream + '\'' +
-            ", filter=" + filter.string() +
+            ", filter=" + (filter != null ? filter.string() : "null") +
             '}';
     }
 }