Repository: cassandra Updated Branches: refs/heads/trunk 2eecd4039 -> 04f74a915
Fix prepared statement on thrift post-6659 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/79da4a6e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/79da4a6e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/79da4a6e Branch: refs/heads/trunk Commit: 79da4a6e0e1b33f880f6228e93905d85122238a2 Parents: 80b3e6c Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Apr 2 11:32:48 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Apr 2 11:33:05 2014 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/QueryProcessor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/79da4a6e/src/java/org/apache/cassandra/cql3/QueryProcessor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java b/src/java/org/apache/cassandra/cql3/QueryProcessor.java index fe818fd..64ea5e5 100644 --- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java +++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java @@ -35,6 +35,7 @@ import org.apache.cassandra.db.*; import org.apache.cassandra.exceptions.*; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; +import org.apache.cassandra.thrift.ThriftClientState; import org.apache.cassandra.tracing.Tracing; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.MD5Digest; @@ -237,7 +238,8 @@ public class QueryProcessor implements QueryHandler public ResultMessage.Prepared prepare(String queryString, QueryState queryState) throws RequestValidationException { - return prepare(queryString, queryState.getClientState(), false); + ClientState cState = queryState.getClientState(); + return prepare(queryString, cState, cState instanceof ThriftClientState); } public static ResultMessage.Prepared prepare(String queryString, ClientState clientState, boolean forThrift)