You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by sy...@apache.org on 2016/01/18 18:05:11 UTC
[4/7] 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/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/hbase-12439
Commit: 2d2fdd5a9fd122a76fc71db549b4e10985395dd2
Parents: 76bce77
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: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;