From 2d2fdd5a9fd122a76fc71db549b4e10985395dd2 Mon Sep 17 00:00:00 2001
From: Enis Soztutar <enis@apache.org>
Date: Fri, 15 Jan 2016 16:42:35 -0800
Subject: [PATCH] HBASE-15114 NPE when IPC server ByteBuffer reservoir is
 turned off

---
 .../src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 d32fca7d43e..cdc97bfd118 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;