From b1b49485f599b327ad0d7e0fd77bb049c3a4ccff Mon Sep 17 00:00:00 2001 From: Andrew Purtell Date: Fri, 1 Dec 2017 15:30:16 -0800 Subject: [PATCH] HBASE-19395 [branch-1] TestEndToEndSplitTransaction.testMasterOpsWhileSplitting fails with NPE --- .../main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java index a93a158539..3ac08f4982 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java @@ -2267,7 +2267,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler, } catch (IOException ie) { throw new ServiceException(ie); } finally { - if (regionServer.metricsRegionServer != null) { + if (regionServer.metricsRegionServer != null && region != null) { regionServer.metricsRegionServer.updateGet( region.getTableDesc().getTableName(), EnvironmentEdgeManager.currentTime() - before); } -- 2.13.4