From 3ba73362cac4b2245ed12e5a43a630bd060f5c97 Mon Sep 17 00:00:00 2001
From: Istvan Toth <stoty@apache.org>
Date: Fri, 15 Sep 2023 01:52:14 +0200
Subject: [PATCH] HBASE-28076 NPE on initialization error in
 RecoveredReplicationSourceShipper (#5397)

Signed-off-by: Viraj Jasani <vjasani@apache.org>
---
 .../regionserver/RecoveredReplicationSourceShipper.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSourceShipper.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSourceShipper.java
index 471ca68f6599..b01df7db8493 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSourceShipper.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSourceShipper.java
@@ -97,8 +97,10 @@ private void terminate(String reason, Exception cause) {
         "Closing worker for wal group " + this.walGroupId + " because an error occurred: " + reason,
         cause);
     }
-    entryReader.interrupt();
-    Threads.shutdown(entryReader, sleepForRetries);
+    if (entryReader != null) {
+      entryReader.interrupt();
+      Threads.shutdown(entryReader, sleepForRetries);
+    }
     this.interrupt();
     Threads.shutdown(this, sleepForRetries);
     LOG.info("ReplicationSourceWorker {} terminated", this.getName());