Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 851B0109A2 for ; Tue, 17 Sep 2013 11:54:39 +0000 (UTC) Received: (qmail 87543 invoked by uid 500); 17 Sep 2013 11:54:39 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 87521 invoked by uid 500); 17 Sep 2013 11:54:39 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 87501 invoked by uid 99); 17 Sep 2013 11:54:38 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Sep 2013 11:54:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B3E9A906B15; Tue, 17 Sep 2013 11:54:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org Message-Id: <80c8b9db93e44bb7af2ed47dabf428b9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Fix prepared statement for protocol v2 Date: Tue, 17 Sep 2013 11:54:37 +0000 (UTC) Updated Branches: refs/heads/cassandra-2.0 ef7abacfc -> 36f217819 Fix prepared statement for protocol v2 patch by slebresne; reviewed by iamaleksey for CASSANDRA-6035 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36f21781 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36f21781 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36f21781 Branch: refs/heads/cassandra-2.0 Commit: 36f21781965b1cc947ac7488d5e3cddd58090729 Parents: ef7abac Author: Sylvain Lebresne Authored: Tue Sep 17 13:52:55 2013 +0200 Committer: Sylvain Lebresne Committed: Tue Sep 17 13:52:55 2013 +0200 ---------------------------------------------------------------------- .../org/apache/cassandra/transport/messages/ResultMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/36f21781/src/java/org/apache/cassandra/transport/messages/ResultMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/ResultMessage.java b/src/java/org/apache/cassandra/transport/messages/ResultMessage.java index 8650c13..3d41793 100644 --- a/src/java/org/apache/cassandra/transport/messages/ResultMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/ResultMessage.java @@ -271,7 +271,7 @@ public abstract class ResultMessage extends Message.Response size += CBUtil.sizeOfBytes(prepared.statementId.bytes); size += ResultSet.Metadata.codec.encodedSize(prepared.metadata, version); if (version > 1) - ResultSet.Metadata.codec.encodedSize(prepared.resultMetadata, version); + size += ResultSet.Metadata.codec.encodedSize(prepared.resultMetadata, version); return size; } };