You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/04/03 04:02:22 UTC
git commit: use guava's Iterators class and emptyIterator
Updated Branches:
refs/heads/trunk aa7639476 -> fbe99b711
use guava's Iterators class and emptyIterator
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fbe99b71
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fbe99b71
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fbe99b71
Branch: refs/heads/trunk
Commit: fbe99b711aa9be3fcfd1e5e0f37c4d45a1717864
Parents: aa76394
Author: Dave Brosius <db...@apache.org>
Authored: Tue Apr 2 22:01:44 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Tue Apr 2 22:01:44 2013 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/EmptyColumns.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbe99b71/src/java/org/apache/cassandra/db/EmptyColumns.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/EmptyColumns.java b/src/java/org/apache/cassandra/db/EmptyColumns.java
index aa48375..af64628 100644
--- a/src/java/org/apache/cassandra/db/EmptyColumns.java
+++ b/src/java/org/apache/cassandra/db/EmptyColumns.java
@@ -5,13 +5,13 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
-import com.google.common.base.Function;
-
-import com.sun.xml.internal.xsom.impl.scd.Iterators;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.db.filter.ColumnSlice;
import org.apache.cassandra.utils.Allocator;
+import com.google.common.base.Function;
+import com.google.common.collect.Iterators;
+
public class EmptyColumns extends AbstractThreadUnsafeSortedColumns
{
public static final Factory<EmptyColumns> factory = new Factory<EmptyColumns>()
@@ -83,12 +83,12 @@ public class EmptyColumns extends AbstractThreadUnsafeSortedColumns
public Iterator<Column> iterator(ColumnSlice[] slices)
{
- return Iterators.empty();
+ return Iterators.emptyIterator();
}
public Iterator<Column> reverseIterator(ColumnSlice[] slices)
{
- return Iterators.empty();
+ return Iterators.emptyIterator();
}
public boolean isInsertReversed()