Repository: cassandra Updated Branches: refs/heads/trunk f79f80e6c -> 30f3899f2
simplify Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/30f3899f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30f3899f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/30f3899f Branch: refs/heads/trunk Commit: 30f3899f212a499f22a54426c67790f9d84d422a Parents: f79f80e Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Wed Apr 1 18:44:25 2015 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Wed Apr 1 18:44:25 2015 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/cql3/statements/SelectStatement.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/30f3899f/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java index 66ad81d..35c8d70 100644 --- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java @@ -626,7 +626,7 @@ public class SelectStatement implements CQLStatement CQL3Row staticRow = iter.getStaticRow(); if (staticRow != null && !iter.hasNext() && !restrictions.usesSecondaryIndexing() && restrictions.hasNoClusteringColumnsRestriction()) { - result.newRow(options.getProtocolVersion()); + result.newRow(protocolVersion); for (ColumnDefinition def : selection.getColumns()) { switch (def.kind) @@ -649,7 +649,7 @@ public class SelectStatement implements CQLStatement CQL3Row cql3Row = iter.next(); // Respect requested order - result.newRow(options.getProtocolVersion()); + result.newRow(protocolVersion); // Respect selection order for (ColumnDefinition def : selection.getColumns()) {
