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 4EA5611484 for ; Wed, 14 May 2014 22:22:44 +0000 (UTC) Received: (qmail 801 invoked by uid 500); 10 May 2014 21:58:16 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 66850 invoked by uid 500); 10 May 2014 21:56:34 -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 57960 invoked by uid 99); 10 May 2014 21:56:12 -0000 Received: from Unknown (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 May 2014 21:56:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C6B659536F8; Fri, 9 May 2014 20:43:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jake@apache.org To: commits@cassandra.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: Work around netty offheap capacity check bug Date: Fri, 9 May 2014 20:43:01 +0000 (UTC) Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 65a46265d -> e3dd88a8c Work around netty offheap capacity check bug patch by tjake; reviewed by Mikhail Stepura for CASSANDRA-7196 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e3dd88a8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e3dd88a8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e3dd88a8 Branch: refs/heads/cassandra-2.1 Commit: e3dd88a8cd49a86ef37b9c4204e87bf8e47aefb7 Parents: 65a4626 Author: Jake Luciani Authored: Fri May 9 16:39:48 2014 -0400 Committer: Jake Luciani Committed: Fri May 9 16:39:48 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/transport/CBUtil.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3dd88a8/src/java/org/apache/cassandra/transport/CBUtil.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/CBUtil.java b/src/java/org/apache/cassandra/transport/CBUtil.java index e6ba029..6ad4682 100644 --- a/src/java/org/apache/cassandra/transport/CBUtil.java +++ b/src/java/org/apache/cassandra/transport/CBUtil.java @@ -330,8 +330,11 @@ public abstract class CBUtil return; } - cb.writeInt(bytes.remaining()); - cb.writeBytes(bytes.duplicate()); + int remaining = bytes.remaining(); + cb.writeInt(remaining); + + if (remaining > 0) + cb.writeBytes(bytes.duplicate()); } public static int sizeOfValue(byte[] bytes)