Author: jbellis Date: Mon Feb 28 23:42:38 2011 New Revision: 1075592 URL: http://svn.apache.org/viewvc?rev=1075592&view=rev Log: revert r1075543
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java?rev=1075592&r1=1075591&r2=1075592&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java (original) +++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java Mon Feb 28 23:42:38 2011 @@ -325,7 +325,7 @@ implements org.apache.hadoop.mapred.Reco } Map<ByteBuffer, Map<String, List<Mutation>>> batch = new HashMap<ByteBuffer, Map<String, List<Mutation>>>(); - while (batch.size() < batchThreshold || mutation != null) + while (batch.size() < batchThreshold) { Map<String, List<Mutation>> subBatch = batch.get(mutation.left); if (subBatch == null) @@ -335,7 +335,6 @@ implements org.apache.hadoop.mapred.Reco } subBatch.get(columnFamily).add(mutation.right); - mutation = null; if ((mutation = queue.poll()) == null) break; }