diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index 04c443f..9962135 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -909,7 +909,9 @@ public class HRegionServer extends HasThread implements } // Start the Quota Manager - rsQuotaManager.start(getRpcServer().getScheduler()); + if (this.rsQuotaManager != null) { + rsQuotaManager.start(getRpcServer().getScheduler()); + } // We registered with the Master. Go into run mode. long lastMsg = System.currentTimeMillis();