HBASE-15114 NPE when IPC server ByteBuffer reservoir is turned off
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c2e6a71d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c2e6a71d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c2e6a71d Branch: refs/heads/branch-1.2 Commit: c2e6a71d49caaea668984466ab244038a1cdbb2c Parents: 492db89 Author: Enis Soztutar <[email protected]> Authored: Fri Jan 15 16:42:35 2016 -0800 Committer: Enis Soztutar <[email protected]> Committed: Fri Jan 15 16:44:23 2016 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/c2e6a71d/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java index fe62e95..8297e90 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java @@ -348,7 +348,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;
