Updated Branches: refs/heads/cassandra-1.2 b97c5233e -> 924492345
OCD follow up Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/92449234 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92449234 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92449234 Branch: refs/heads/cassandra-1.2 Commit: 92449234519374d49585fec3d2940c9d5e7851f4 Parents: b97c523 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Dec 20 20:15:07 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Dec 20 20:15:07 2013 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/QueryProcessor.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/92449234/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 332aea1..dc94a18 100644 --- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java +++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java @@ -220,10 +220,10 @@ public class QueryProcessor ParsedStatement.Prepared prepared = getStatement(queryString, clientState); ResultMessage.Prepared msg = storePreparedStatement(queryString, clientState.getRawKeyspace(), prepared, forThrift); - int bountTerms = prepared.statement.getBoundTerms(); - if (bountTerms > FBUtilities.MAX_UNSIGNED_SHORT) - throw new InvalidRequestException(String.format("Too many markers(?). %d markers exceed the allowed maximum of %d", bountTerms, FBUtilities.MAX_UNSIGNED_SHORT)); - assert bountTerms == prepared.boundNames.size(); + int boundTerms = prepared.statement.getBoundTerms(); + if (boundTerms > FBUtilities.MAX_UNSIGNED_SHORT) + throw new InvalidRequestException(String.format("Too many markers(?). %d markers exceed the allowed maximum of %d", boundTerms, FBUtilities.MAX_UNSIGNED_SHORT)); + assert boundTerms == prepared.boundNames.size(); return msg; }
