Author: jbellis
Date: Wed Mar 9 15:24:24 2011
New Revision: 1079833
URL: http://svn.apache.org/viewvc?rev=1079833&view=rev
Log:
fix #2 for counter replication NPE
patch by Stu Hood; reviewed by slebresne for CASSANDRA-2289
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/CounterMutation.java
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/CounterMutation.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/CounterMutation.java?rev=1079833&r1=1079832&r2=1079833&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/CounterMutation.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/CounterMutation.java Wed
Mar 9 15:24:24 2011
@@ -126,7 +126,7 @@ public class CounterMutation implements
{
Table table = Table.open(readCommand.table);
Row row = readCommand.getRow(table);
- if (null == row)
+ if (row == null || row.cf == null)
continue;
AbstractType defaultValidator =
row.cf.metadata().getDefaultValidator();
if (defaultValidator.isCommutative())
