You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/04/26 01:01:43 UTC
[2/3] git commit: apply fix for CASSANDRA-4834 to the 1.2 branch. See
also CASSANDRA-5504
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/trunk
Commit: 9793d6f32de5aab8b45fbf870104617e02bf3183
Parents: 68444f9
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Apr 25 18:00:59 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
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<ByteBuffer, SortedMap
return endOfData();
Pair<ByteBuffer, SortedMap<ByteBuffer, IColumn>> 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<ByteBuffer, SortedMap
if (this.nextKeyValue())
{
key.clear();
- key.put(this.getCurrentKey());
+ key.put(this.getCurrentKey().duplicate());
key.flip();
value.clear();