From eb36aadad44c8374f7c2dabe0bc989976d9025a8 Mon Sep 17 00:00:00 2001
From: Xiaodong Xie <xiaodongxie329@gmail.com>
Date: Fri, 11 May 2018 19:57:16 +0200
Subject: [PATCH] Fix NPE, CASSANDRA-14444

---
 src/java/org/apache/cassandra/service/pager/PagingState.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java/org/apache/cassandra/service/pager/PagingState.java b/src/java/org/apache/cassandra/service/pager/PagingState.java
index 4a9ac391f5c4..9104f910038e 100644
--- a/src/java/org/apache/cassandra/service/pager/PagingState.java
+++ b/src/java/org/apache/cassandra/service/pager/PagingState.java
@@ -46,7 +46,7 @@ public class PagingState
 
     public PagingState(ByteBuffer partitionKey, RowMark rowMark, int remaining, int remainingInPartition)
     {
-        this.partitionKey = partitionKey;
+        this.partitionKey = partitionKey == null ? ByteBufferUtil.EMPTY_BYTE_BUFFER : partitionKey;
         this.rowMark = rowMark;
         this.remaining = remaining;
         this.remainingInPartition = remainingInPartition;