You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2016/02/10 08:37:17 UTC
hbase git commit: HBASE-15114 NPE when IPC server ByteBuffer
reservoir is turned off
Repository: hbase
Updated Branches:
refs/heads/0.98 4e2ab8f23 -> d3ec4dc95
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/d3ec4dc9
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d3ec4dc9
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d3ec4dc9
Branch: refs/heads/0.98
Commit: d3ec4dc9533ab35fec5b09be1f1506f0f19e34b2
Parents: 4e2ab8f
Author: Enis Soztutar <en...@apache.org>
Authored: Fri Jan 15 16:42:35 2016 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Feb 9 23:36:37 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/d3ec4dc9/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 a9f5bf4..3996903 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
@@ -346,7 +346,7 @@ public class RpcServer implements RpcServerInterface {
* 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;