Author: jbellis Date: Tue Sep 13 12:57:47 2011 New Revision: 1170162 URL: http://svn.apache.org/viewvc?rev=1170162&view=rev Log: fix RRR NPE patch by jbellis; reviewed by slebresne for CASSANDRA-3192
Modified: cassandra/branches/cassandra-1.0.0/CHANGES.txt cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/RowRepairResolver.java Modified: cassandra/branches/cassandra-1.0.0/CHANGES.txt URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/CHANGES.txt?rev=1170162&r1=1170161&r2=1170162&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0.0/CHANGES.txt (original) +++ cassandra/branches/cassandra-1.0.0/CHANGES.txt Tue Sep 13 12:57:47 2011 @@ -24,7 +24,7 @@ * use lazy initialization instead of class initialization in NodeId (CASSANDRA-2953) * add paging to get_count (CASSANDRA-2894) - * fix "short reads" in [multi]get (CASSANDRA-2643, 3157) + * fix "short reads" in [multi]get (CASSANDRA-2643, 3157, 3192) * add optional compression for sstables (CASSANDRA-47, 3001, 3128) * add scheduler JMX metrics (CASSANDRA-2962) * add block level checksum for compressed data (CASSANDRA-1717) Modified: cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/RowRepairResolver.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/RowRepairResolver.java?rev=1170162&r1=1170161&r2=1170162&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/RowRepairResolver.java (original) +++ cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/RowRepairResolver.java Tue Sep 13 12:57:47 2011 @@ -79,7 +79,7 @@ public class RowRepairResolver extends A endpoints.add(message.getFrom()); // compute maxLiveColumns to prevent short reads -- see https://issues.apache.org/jira/browse/CASSANDRA-2643 - int liveColumns = cf.getLiveColumnCount(); + int liveColumns = cf == null ? 0 : cf.getLiveColumnCount(); if (liveColumns > maxLiveColumns) maxLiveColumns = liveColumns; }