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 D5B6E7800 for ; Tue, 29 Nov 2011 16:58:48 +0000 (UTC) Received: (qmail 98976 invoked by uid 500); 29 Nov 2011 16:58:48 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 98953 invoked by uid 500); 29 Nov 2011 16:58:48 -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 98945 invoked by uid 99); 29 Nov 2011 16:58:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Nov 2011 16:58:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Nov 2011 16:58:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D7DA1238897F for ; Tue, 29 Nov 2011 16:58:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1207969 - in /cassandra/branches/cassandra-1.0: CHANGES.txt src/java/org/apache/cassandra/service/StorageProxy.java Date: Tue, 29 Nov 2011 16:58:24 -0000 To: commits@cassandra.apache.org From: slebresne@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111129165824.D7DA1238897F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: slebresne Date: Tue Nov 29 16:58:23 2011 New Revision: 1207969 URL: http://svn.apache.org/viewvc?rev=1207969&view=rev Log: Fix assertion error while forwarding writes to local nodes patch by slebresne; reviewed by jbellis for CASSANDRA-3539 Modified: cassandra/branches/cassandra-1.0/CHANGES.txt cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/service/StorageProxy.java Modified: cassandra/branches/cassandra-1.0/CHANGES.txt URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/CHANGES.txt?rev=1207969&r1=1207968&r2=1207969&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/CHANGES.txt (original) +++ cassandra/branches/cassandra-1.0/CHANGES.txt Tue Nov 29 16:58:23 2011 @@ -1,6 +1,7 @@ 1.0.5 * add command to stop compactions (CASSANDRA-1740) * filter out unavailable cipher suites when using encryption (CASSANDRA-3178) + * fix assertion error when forwarding to local nodes (CASSANDRA-3539) 1.0.4 * fix self-hinting of timed out read repair updates and make hinted handoff Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/service/StorageProxy.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/service/StorageProxy.java?rev=1207969&r1=1207968&r2=1207969&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/service/StorageProxy.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/service/StorageProxy.java Tue Nov 29 16:58:23 2011 @@ -411,14 +411,17 @@ public class StorageProxy implements Sto Iterator iter = messages.getValue().iterator(); InetAddress target = iter.next(); // Add all the other destinations of the same message as a header in the primary message. - FastByteArrayOutputStream bos = new FastByteArrayOutputStream(); - DataOutputStream dos = new DataOutputStream(bos); - while (iter.hasNext()) + if (iter.hasNext()) { - InetAddress destination = iter.next(); - dos.write(destination.getAddress()); + FastByteArrayOutputStream bos = new FastByteArrayOutputStream(); + DataOutputStream dos = new DataOutputStream(bos); + while (iter.hasNext()) + { + InetAddress destination = iter.next(); + dos.write(destination.getAddress()); + } + message = message.withHeaderAdded(RowMutation.FORWARD_HEADER, bos.toByteArray()); } - message = message.withHeaderAdded(RowMutation.FORWARD_HEADER, bos.toByteArray()); // send the combined message + forward headers MessagingService.instance().sendRR(message, target, handler); }