Repository: cassandra Updated Branches: refs/heads/12060-3.0-v2 [created] c14f6546f
Update code Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/724a47a8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/724a47a8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/724a47a8 Branch: refs/heads/12060-3.0-v2 Commit: 724a47a89418994fcaaa494bb5fd90d30518e19d Parents: 006ebf6 Author: Alex Petrov <[email protected]> Authored: Wed Aug 17 15:28:43 2016 +0200 Committer: Alex Petrov <[email protected]> Committed: Wed Aug 17 15:30:21 2016 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/thrift/CassandraServer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/724a47a8/src/java/org/apache/cassandra/thrift/CassandraServer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java index 0dec94e..201dc43 100644 --- a/src/java/org/apache/cassandra/thrift/CassandraServer.java +++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java @@ -2554,8 +2554,8 @@ public class CassandraServer implements Cassandra.Iface public boolean appliesTo(FilteredPartition current) { if (expected.isEmpty()) - return current.isEmpty(); - else if (current.isEmpty()) + return current == null; + else if (current == null) return false; // Push the expected results through ThriftResultsMerger to translate any static
