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 C24E4F99A for ; Thu, 25 Apr 2013 23:01:42 +0000 (UTC) Received: (qmail 29552 invoked by uid 500); 25 Apr 2013 23:01:42 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 29512 invoked by uid 500); 25 Apr 2013 23:01:42 -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 29501 invoked by uid 99); 25 Apr 2013 23:01:42 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Apr 2013 23:01:42 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2B529881875; Thu, 25 Apr 2013 23:01:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Thu, 25 Apr 2013 23:01:42 -0000 Message-Id: <41d99047ec5b4137991a9078795db6b5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: apply fix for CASSANDRA-4834 to the 1.2 branch. See also CASSANDRA-5504 Updated Branches: refs/heads/cassandra-1.2 68444f9b2 -> 9793d6f32 refs/heads/trunk 5d821a1ea -> 4a104d904 apply fix for CASSANDRA-4834 to the 1.2 branch. See also CASSANDRA-5504 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9793d6f3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9793d6f3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9793d6f3 Branch: refs/heads/cassandra-1.2 Commit: 9793d6f32de5aab8b45fbf870104617e02bf3183 Parents: 68444f9 Author: Jonathan Ellis Authored: Thu Apr 25 18:00:59 2013 -0500 Committer: Jonathan Ellis Committed: Thu Apr 25 18:00:59 2013 -0500 ---------------------------------------------------------------------- .../cassandra/hadoop/ColumnFamilyRecordReader.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9793d6f3/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java index dfeacc3..a987519 100644 --- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java +++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java @@ -461,7 +461,7 @@ public class ColumnFamilyRecordReader extends RecordReader> next = wideColumns.next(); - lastColumn = next.right.values().iterator().next().name(); + lastColumn = next.right.values().iterator().next().name().duplicate(); maybeIncreaseRowCounter(next); return next; @@ -534,7 +534,7 @@ public class ColumnFamilyRecordReader extends RecordReader