diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java index ed8d37d..b3a58b1 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java @@ -349,7 +349,7 @@ public class RpcServer implements RpcServerInterface, ConfigurationObserver { * cleanup. */ void done() { - if (this.cellBlock != null) { + if (this.cellBlock != null && reservoir != null) { // Return buffer to reservoir now we are done with it. reservoir.putBuffer(this.cellBlock); this.cellBlock = null;