Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3E735200C55 for ; Thu, 13 Apr 2017 11:23:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3D218160BAA; Thu, 13 Apr 2017 09:23:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8417F160B8B for ; Thu, 13 Apr 2017 11:23:54 +0200 (CEST) Received: (qmail 63250 invoked by uid 500); 13 Apr 2017 09:23:52 -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 63223 invoked by uid 99); 13 Apr 2017 09:23:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Apr 2017 09:23:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C2491DFBBB; Thu, 13 Apr 2017 09:23:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: snazy@apache.org To: commits@cassandra.apache.org Date: Thu, 13 Apr 2017 09:23:52 -0000 Message-Id: <9b5940bc87124e64ac43b317041a509c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] cassandra git commit: V5 protocol flags decoding broken archived-at: Thu, 13 Apr 2017 09:23:55 -0000 Repository: cassandra Updated Branches: refs/heads/cassandra-3.11 fe8e21109 -> 0a438d59e refs/heads/trunk 1f533260a -> 7da45312a V5 protocol flags decoding broken patch by Robert Stupp; reviewed by Stefania for CASSANDRA-13443 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0a438d59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0a438d59 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0a438d59 Branch: refs/heads/cassandra-3.11 Commit: 0a438d59e65ee79bca7ffc44b8b958e62448e5c3 Parents: fe8e211 Author: Robert Stupp Authored: Thu Apr 13 11:06:29 2017 +0200 Committer: Robert Stupp Committed: Thu Apr 13 11:06:29 2017 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/QueryOptions.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a438d59/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 7998e10..5516bbd 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.11.0 + * V5 protocol flags decoding broken (CASSANDRA-13443) * Use write lock not read lock for removing sstables from compaction strategies. (CASSANDRA-13422) * Use corePoolSize equal to maxPoolSize in JMXEnabledThreadPoolExecutors (CASSANDRA-13329) * Avoid rebuilding SASI indexes containing no values (CASSANDRA-12962) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a438d59/src/java/org/apache/cassandra/cql3/QueryOptions.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/QueryOptions.java b/src/java/org/apache/cassandra/cql3/QueryOptions.java index 1ba8f89..f1787a7 100644 --- a/src/java/org/apache/cassandra/cql3/QueryOptions.java +++ b/src/java/org/apache/cassandra/cql3/QueryOptions.java @@ -403,7 +403,7 @@ public abstract class QueryOptions ConsistencyLevel consistency = CBUtil.readConsistencyLevel(body); EnumSet flags = Flag.deserialize(version.isGreaterOrEqualTo(ProtocolVersion.V5) ? (int)body.readUnsignedInt() - : (int)body.readByte()); + : (int)body.readUnsignedByte()); List values = Collections.emptyList(); List names = null;