From b2cdfc446628222db984ae03be4506a92ce97b2c Mon Sep 17 00:00:00 2001
From: Iraklis Psaroudakis <kingherc@gmail.com>
Date: Thu, 10 Jul 2025 11:24:30 +0300
Subject: [PATCH] Fix NPE in IndexShard flushStats (#130809)

Fixes #124164
---
 .../main/java/org/elasticsearch/index/shard/IndexShard.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java
index ed31a74ac326b..611284b21660a 100644
--- a/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java
+++ b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java
@@ -1344,11 +1344,12 @@ public RefreshStats refreshStats() {
     }
 
     public FlushStats flushStats() {
+        final Engine engine = getEngineOrNull();
         return new FlushStats(
             flushMetric.count(),
             periodicFlushMetric.count(),
             TimeUnit.NANOSECONDS.toMillis(flushMetric.sum()),
-            getEngineOrNull() != null ? getEngineOrNull().getTotalFlushTimeExcludingWaitingOnLockInMillis() : 0L
+            engine != null ? engine.getTotalFlushTimeExcludingWaitingOnLockInMillis() : 0L
         );
     }