Updated Branches: refs/heads/trunk 6516eba92 -> 26dcb7d81
Fix typo Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/26dcb7d8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26dcb7d8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/26dcb7d8 Branch: refs/heads/trunk Commit: 26dcb7d81ff51e8a3fbf422c612e330ae2964e25 Parents: 6516eba Author: Sylvain Lebresne <[email protected]> Authored: Wed Oct 31 19:31:32 2012 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Oct 31 19:31:48 2012 +0100 ---------------------------------------------------------------------- .../cassandra/db/filter/SliceQueryFilter.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/26dcb7d8/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java index e045bb5..ae81f91 100644 --- a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java +++ b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java @@ -211,9 +211,10 @@ public class SliceQueryFilter implements IFilter } } - for (ByteBuffer columnName : toRemove) + if (toRemote != null) { - cf.remove(columnName); + for (ByteBuffer columnName : toRemove) + cf.remove(columnName); } }
