From 56b499044b675c2962f28825fe4eb55cec23db68 Mon Sep 17 00:00:00 2001
From: Jonathan Ellis <jbellis@apache.org>
Date: Fri, 22 May 2009 15:37:19 +0000
Subject: [PATCH] use cloneMeShallow where appropriate.  patch by jbellis for
 CASSANDRA-79

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@777583 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java/org/apache/cassandra/db/CountFilter.java | 4 ++--
 src/java/org/apache/cassandra/db/NamesFilter.java | 4 ++--
 src/java/org/apache/cassandra/db/RangeFilter.java | 2 +-
 src/java/org/apache/cassandra/db/TimeFilter.java  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/java/org/apache/cassandra/db/CountFilter.java b/src/java/org/apache/cassandra/db/CountFilter.java
index 8a41f7113a..f71487fc03 100644
--- a/src/java/org/apache/cassandra/db/CountFilter.java
+++ b/src/java/org/apache/cassandra/db/CountFilter.java
@@ -55,9 +55,9 @@ public class CountFilter implements IFilter
 	{
     	String[] values = RowMutation.getColumnAndColumnFamily(cfNameParam);
         if ( columnFamily == null )
-            return columnFamily;
+            return null;
 
-        ColumnFamily filteredCf = new ColumnFamily(columnFamily.name(), columnFamily.type());
+        ColumnFamily filteredCf = columnFamily.cloneMeShallow();
 		if( countLimit_ <= 0 )
 		{
 			isDone_ = true;
diff --git a/src/java/org/apache/cassandra/db/NamesFilter.java b/src/java/org/apache/cassandra/db/NamesFilter.java
index 2f7c9a9afc..2966c6fdf9 100644
--- a/src/java/org/apache/cassandra/db/NamesFilter.java
+++ b/src/java/org/apache/cassandra/db/NamesFilter.java
@@ -43,10 +43,10 @@ public class NamesFilter implements IFilter
     {
         if ( columnFamily == null )
         {
-            return columnFamily;
+            return null;
         }
     	String[] values = RowMutation.getColumnAndColumnFamily(cf);
-        ColumnFamily filteredCf = new ColumnFamily(columnFamily.name(), columnFamily.type());
+        ColumnFamily filteredCf = columnFamily.cloneMeShallow();
 		if( values.length == 1 )
 		{
 			Collection<IColumn> columns = columnFamily.getAllColumns();
diff --git a/src/java/org/apache/cassandra/db/RangeFilter.java b/src/java/org/apache/cassandra/db/RangeFilter.java
index 43fa8d29ba..54eae61d0c 100644
--- a/src/java/org/apache/cassandra/db/RangeFilter.java
+++ b/src/java/org/apache/cassandra/db/RangeFilter.java
@@ -63,7 +63,7 @@ public class RangeFilter implements IFilter
             return null;
         }
 
-        ColumnFamily filteredColumnFamily = new ColumnFamily(cfName, cf.type());
+        ColumnFamily filteredColumnFamily = cf.cloneMeShallow();
 
         Collection<IColumn> columns = cf.getAllColumns();
         for (IColumn c : columns)
diff --git a/src/java/org/apache/cassandra/db/TimeFilter.java b/src/java/org/apache/cassandra/db/TimeFilter.java
index b49d14522e..07f71f2de1 100644
--- a/src/java/org/apache/cassandra/db/TimeFilter.java
+++ b/src/java/org/apache/cassandra/db/TimeFilter.java
@@ -48,10 +48,10 @@ class TimeFilter implements IFilter
 	public ColumnFamily filter(String cf, ColumnFamily columnFamily)
 	{
     	if (columnFamily == null)
-    		return columnFamily;
+    		return null;
 
         String[] values = RowMutation.getColumnAndColumnFamily(cf);
-        ColumnFamily filteredCf = new ColumnFamily(columnFamily.name(), columnFamily.type());
+        ColumnFamily filteredCf = columnFamily.cloneMeShallow();
 		if (values.length == 1 && !columnFamily.isSuper())
 		{
     		Collection<IColumn> columns = columnFamily.getAllColumns();