From 00b7efa6ff68fc533925ebeb0e956c8a130d0b09 Mon Sep 17 00:00:00 2001
From: Sylvain Lebresne <sylvain@datastax.com>
Date: Fri, 2 Oct 2015 17:02:43 +0200
Subject: [PATCH] Fix static_columns_paging_test upgrade dtest

patch by slebresne; reviewed by blerer for CASSANDRA-10376
---
 src/java/org/apache/cassandra/db/ReadCommand.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java
index f29a009da9..3b1f8a8650 100644
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@ -1583,7 +1583,11 @@ public abstract class ReadCommand implements ReadQuery
         {
             SortedSet<Clustering> requestedRows = filter.requestedRows();
             Slices slices;
-            if (requestedRows.isEmpty() || requestedRows.size() == 1 && requestedRows.first().size() == 0)
+            if (requestedRows.isEmpty())
+            {
+                slices = Slices.NONE;
+            }
+            else if (requestedRows.size() == 1 && requestedRows.first().size() == 0)
             {
                 slices = Slices.ALL;
             }