From e958edde7bd9b378ca1c348d5f46583377f64280 Mon Sep 17 00:00:00 2001
From: binlijin <binlijin@gmail.com>
Date: Tue, 13 Jul 2021 20:35:54 +0800
Subject: [PATCH] HBASE-26086 TestHRegionReplayEvents do not pass in branch-2
 and throws NullPointerException

---
 .../main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index 90cfbdef14b0..e5bb017c0f7f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -7526,7 +7526,7 @@ void metricsUpdateForGet(List<Cell> results, long before) {
     if (this.metricsRegion != null) {
       this.metricsRegion.updateGet(EnvironmentEdgeManager.currentTime() - before);
     }
-    if (rsServices != null) {
+    if (rsServices != null && this.rsServices.getMetrics() != null) {
       rsServices.getMetrics().updateReadQueryMeter(getTableDescriptor().getTableName(), 1);
     }
   }