You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2016/01/16 02:01:38 UTC
[2/3] hbase git commit: HBASE-15114 NPE when IPC server ByteBuffer
reservoir is turned off
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/795f9143
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/795f9143
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/795f9143
Branch: refs/heads/branch-1
Commit: 795f91439c8b704b6929dcdcb433bea44beea9ac
Parents: 546adef
Author: Enis Soztutar <en...@apache.org>
Authored: Fri Jan 15 16:42:35 2016 -0800
Committer: Enis Soztutar <en...@apache.org>
Committed: Fri Jan 15 16:42:41 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/795f9143/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 0011c2e..4c93d80 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;