Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 e0718bcdf -> 47675ce75 refs/heads/trunk 5011437b1 -> 572731247
fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/47675ce7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47675ce7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/47675ce7 Branch: refs/heads/cassandra-2.1 Commit: 47675ce7598ed07dc227fd2ebe3e169180f3b0a8 Parents: e0718bc Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Mar 14 15:41:56 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Mar 14 15:41:58 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/47675ce7/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 325521b..f5a2603 100644 --- a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java +++ b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java @@ -36,6 +36,7 @@ import org.apache.cassandra.db.composites.CType; import org.apache.cassandra.db.composites.CellName; import org.apache.cassandra.db.composites.CellNameType; import org.apache.cassandra.db.composites.Composite; +import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.io.util.FileDataInput; @@ -222,11 +223,10 @@ public class SliceQueryFilter implements IDiskAtomFilter if (respectTombstoneThresholds() && columnCounter.ignored() > DatabaseDescriptor.getTombstoneWarnThreshold()) { StringBuilder sb = new StringBuilder(); - AbstractType<?> type = container.metadata().comparator; + CellNameType type = container.metadata().comparator; for (ColumnSlice sl : slices) { - if (sl == null) - continue; + assert sl != null; sb.append('['); sb.append(type.getString(sl.start));
