diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java index 13dc31efe77..b33d4b8eb5b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java @@ -3428,8 +3428,9 @@ public class MasterRpcServices extends RSRpcServices implements namedQueueGetRequest.setBalancerDecisionsRequest(request); NamedQueueGetResponse namedQueueGetResponse = namedQueueRecorder.getNamedQueueRecords(namedQueueGetRequest); - List balancerDecisions = - namedQueueGetResponse.getBalancerDecisions(); + List balancerDecisions = namedQueueGetResponse != null ? + namedQueueGetResponse.getBalancerDecisions() : + Collections.emptyList(); return MasterProtos.BalancerDecisionsResponse.newBuilder() .addAllBalancerDecision(balancerDecisions).build(); } @@ -3446,8 +3447,9 @@ public class MasterRpcServices extends RSRpcServices implements namedQueueGetRequest.setBalancerRejectionsRequest(request); NamedQueueGetResponse namedQueueGetResponse = namedQueueRecorder.getNamedQueueRecords(namedQueueGetRequest); - List balancerRejections = - namedQueueGetResponse.getBalancerRejections(); + List balancerRejections = namedQueueGetResponse != null ? + namedQueueGetResponse.getBalancerRejections() : + Collections.emptyList(); return MasterProtos.BalancerRejectionsResponse.newBuilder() .addAllBalancerRejection(balancerRejections).build(); }