From 1409b550ae7f7fcf9c6cbe7e0dbf59c7363618ad Mon Sep 17 00:00:00 2001
From: Chris Larsen <clarsen@yahoo-inc.com>
Date: Thu, 2 Jun 2016 11:43:48 -0700
Subject: [PATCH] Fix #794 by making sure the group bys and row key literals
 list is not null before checking if it's empty.

Signed-off-by: Chris Larsen <clarsen@yahoo-inc.com>
---
 src/query/QueryUtil.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/query/QueryUtil.java b/src/query/QueryUtil.java
index 994ce86214..1a61c45a0a 100644
--- a/src/query/QueryUtil.java
+++ b/src/query/QueryUtil.java
@@ -200,7 +200,8 @@ public static void setDataTableScanFilter(
       final int end_time) {
     
     // no-op
-    if (group_bys.isEmpty() && row_key_literals.isEmpty()) {
+    if ((group_bys == null || group_bys.isEmpty()) 
+        && (row_key_literals == null || row_key_literals.isEmpty())) {
       return;
     }