diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index 2144fbc..b74358e 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -1734,7 +1734,9 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa @Override public void stop(final String msg) { try { - this.rsHost.preStop(msg); + if (this.rsHost != null) { + this.rsHost.preStop(msg); + } this.stopped = true; LOG.info("STOPPED: " + msg); // Wakes run() if it is sleeping