Repository: cassandra Updated Branches: refs/heads/trunk c5a819005 -> 866afef29
simplify Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/866afef2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/866afef2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/866afef2 Branch: refs/heads/trunk Commit: 866afef295df84030a2bd6ba8a002bd1e5a8fdf6 Parents: c5a8190 Author: Dave Brosius <[email protected]> Authored: Wed Apr 8 00:43:52 2015 -0400 Committer: Dave Brosius <[email protected]> Committed: Wed Apr 8 00:43:52 2015 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/ResultSet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/866afef2/src/java/org/apache/cassandra/cql3/ResultSet.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/ResultSet.java b/src/java/org/apache/cassandra/cql3/ResultSet.java index 267c7c1..9698791 100644 --- a/src/java/org/apache/cassandra/cql3/ResultSet.java +++ b/src/java/org/apache/cassandra/cql3/ResultSet.java @@ -350,7 +350,7 @@ public class ResultSet boolean globalTablesSpec = m.flags.contains(Flag.GLOBAL_TABLES_SPEC); boolean hasMorePages = m.flags.contains(Flag.HAS_MORE_PAGES); - assert version > 1 || (!m.flags.contains(Flag.HAS_MORE_PAGES) && !noMetadata): "version = " + version + ", flags = " + m.flags; + assert version > 1 || (!hasMorePages && !noMetadata): "version = " + version + ", flags = " + m.flags; dest.writeInt(Flag.serialize(m.flags)); dest.writeInt(m.columnCount);
