You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2009/03/27 03:18:55 UTC
svn commit: r758970 -
/incubator/cassandra/trunk/src/org/apache/cassandra/db/TimeFilter.java
Author: jbellis
Date: Fri Mar 27 02:18:54 2009
New Revision: 758970
URL: http://svn.apache.org/viewvc?rev=758970&view=rev
Log:
add null check to TimeFilter for consistency
Modified:
incubator/cassandra/trunk/src/org/apache/cassandra/db/TimeFilter.java
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/db/TimeFilter.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/db/TimeFilter.java?rev=758970&r1=758969&r2=758970&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/db/TimeFilter.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/db/TimeFilter.java Fri Mar 27 02:18:54 2009
@@ -47,7 +47,10 @@
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"))