diff --git a/CHANGES.txt b/CHANGES.txt index d12a8f8fca..cbf9ab1ff8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.10 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706) * Fix failure in LogTransactionTest (CASSANDRA-12632) * Fix potentially incomplete non-frozen UDT values when querying with the full primary key specified (CASSANDRA-12605) diff --git a/src/java/org/apache/cassandra/db/Slices.java b/src/java/org/apache/cassandra/db/Slices.java index bb354a1031..269386e15e 100644 --- a/src/java/org/apache/cassandra/db/Slices.java +++ b/src/java/org/apache/cassandra/db/Slices.java @@ -745,7 +745,7 @@ public abstract class Slices implements Iterable public boolean isEQ() { - return startValue.equals(endValue); + return Objects.equals(startValue, endValue); } } } diff --git a/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java b/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java index b5d8159acf..7f59e2fd73 100644 --- a/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java +++ b/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java @@ -215,4 +215,25 @@ public class SinglePartitionSliceCommandTest checkForS(pi); } } + + @Test + public void toCQLStringIsSafeToCall() throws IOException + { + DecoratedKey key = cfm.decorateKey(ByteBufferUtil.bytes("k1")); + + ColumnFilter columnFilter = ColumnFilter.selection(PartitionColumns.of(s)); + Slice slice = Slice.make(Slice.Bound.BOTTOM, Slice.Bound.inclusiveEndOf(ByteBufferUtil.bytes("i1"))); + ClusteringIndexSliceFilter sliceFilter = new ClusteringIndexSliceFilter(Slices.with(cfm.comparator, slice), false); + ReadCommand cmd = new SinglePartitionReadCommand(false, MessagingService.VERSION_30, true, cfm, + FBUtilities.nowInSeconds(), + columnFilter, + RowFilter.NONE, + DataLimits.NONE, + key, + sliceFilter); + + String ret = cmd.toCQLString(); + Assert.assertNotNull(ret); + Assert.assertFalse(ret.isEmpty()); + } }