From 1021ecc04ffe88a11918739cdce36b9aa126fbc6 Mon Sep 17 00:00:00 2001
From: Sergey Soldatov <ssa@apache.org>
Date: Tue, 9 Sep 2025 08:35:37 -0700
Subject: [PATCH] HDDS-13621. NPE in OzoneManagerRatisServer.checkRetryCache

---
 .../hadoop/ozone/om/ratis/OzoneManagerRatisServer.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java
index aa2e42d72da3..ab935aef16dc 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java
@@ -542,7 +542,11 @@ public OMResponse checkRetryCache() throws ServiceException {
     }
     //cache hit
     try {
-      return getOMResponse(cacheEntry.getReplyFuture().get());
+      RaftClientReply reply = cacheEntry.getReplyFuture().get();
+      if (!reply.isSuccess()) {
+        return null;
+      }
+      return getOMResponse(reply);
     } catch (ExecutionException ex) {
       throw new ServiceException(ex.getMessage(), ex);
     } catch (InterruptedException ex) {