You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/09/05 16:10:39 UTC
git commit: Fix assertion error when preparing query without
parameters (binary protocol)
Updated Branches:
refs/heads/trunk a9d4e649f -> 565f7e780
Fix assertion error when preparing query without parameters (binary protocol)
patch by Christoph Hack; reviewed by slebresne for CASSANDRA-4577
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/565f7e78
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/565f7e78
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/565f7e78
Branch: refs/heads/trunk
Commit: 565f7e7802f8f31ee792882904a230b51fc32b50
Parents: a9d4e64
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Sep 5 16:09:21 2012 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Sep 5 16:09:21 2012 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/ResultSet.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/565f7e78/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 c6a93e6..2b51469 100644
--- a/src/java/org/apache/cassandra/cql3/ResultSet.java
+++ b/src/java/org/apache/cassandra/cql3/ResultSet.java
@@ -209,7 +209,7 @@ public class ResultSet
public Metadata(List<ColumnSpecification> names)
{
this(EnumSet.noneOf(Flag.class), names);
- if (allInSameCF())
+ if (!names.isEmpty() && allInSameCF())
flags.add(Flag.GLOBAL_TABLES_SPEC);
}