From e9e08ff6b572c851ecfcfe49bc63de43dfe3ed04 Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Fri, 27 Mar 2009 02:18:54 +0000 Subject: [PATCH] add null check to TimeFilter for consistency git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758970 13f79535-47bb-0310-9956-ffa450edef68 --- src/org/apache/cassandra/db/TimeFilter.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/org/apache/cassandra/db/TimeFilter.java b/src/org/apache/cassandra/db/TimeFilter.java index d92eb122a1..5adc6e47cc 100644 --- a/src/org/apache/cassandra/db/TimeFilter.java +++ b/src/org/apache/cassandra/db/TimeFilter.java @@ -47,7 +47,10 @@ class TimeFilter implements IFilter public ColumnFamily filter(String cf, ColumnFamily columnFamily) { - String[] values = RowMutation.getColumnAndColumnFamily(cf); + if (columnFamily == null) + return columnFamily; + + String[] values = RowMutation.getColumnAndColumnFamily(cf); String cfName = columnFamily.name(); ColumnFamily filteredCf = new ColumnFamily(cfName); if( values.length == 1 && !DatabaseDescriptor.getColumnType(cfName).equals("Super"))