From edcd93ad267f7f8bfebf8de0fed6d36595d9e1a0 Mon Sep 17 00:00:00 2001 From: xuqinya Date: Thu, 13 Dec 2018 14:40:47 +0800 Subject: [PATCH] HBASE-21592 quota.addGetResult(r) throw NPE --- .../hadoop/hbase/regionserver/RSRpcServices.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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 df84dcf..b7845a5 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 @@ -2570,7 +2570,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler, } builder.setResult(pbr); } - if (r != null) { + if (r != null && r.rawCells() != null) { quota.addGetResult(r); } return builder.build(); -- 1.7.1