Repository: hbase Updated Branches: refs/heads/branch-1 546adefcd -> 795f91439 refs/heads/branch-1.2 492db89d4 -> c2e6a71d4 refs/heads/master 76bce7732 -> 2d2fdd5a9
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/2d2fdd5a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2d2fdd5a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2d2fdd5a Branch: refs/heads/master Commit: 2d2fdd5a9fd122a76fc71db549b4e10985395dd2 Parents: 76bce77 Author: Enis Soztutar <[email protected]> Authored: Fri Jan 15 16:42:35 2016 -0800 Committer: Enis Soztutar <[email protected]> Committed: Fri Jan 15 16:42:35 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/2d2fdd5a/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 d32fca7..cdc97bf 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 @@ -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;
