From d173ba6b2d7d9e20144679b657d0afa88be6db34 Mon Sep 17 00:00:00 2001 From: Armin Braun Date: Mon, 9 Nov 2020 17:02:11 +0100 Subject: [PATCH] Fix NPE in toString of FailedShard (#64770) (#64779) The concatenation took precedence over the null check, leading to an NPE because `null` was passed to `ExceptionsHelper.stackTrace(failure))`. --- .../elasticsearch/cluster/routing/allocation/FailedShard.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedShard.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedShard.java index f2c80af147f..c25b40322d0 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedShard.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedShard.java @@ -43,7 +43,7 @@ public class FailedShard { @Override public String toString() { return "failed shard, shard " + routingEntry + ", message [" + message + "], failure [" + - failure == null ? "null" : ExceptionsHelper.detailedMessage(failure) + "], markAsStale [" + markAsStale + "]"; + (failure == null ? "null" : ExceptionsHelper.detailedMessage(failure)) + "], markAsStale [" + markAsStale + "]"; } /**