Author: slebresne
Date: Tue Nov 8 17:50:12 2011
New Revision: 1199361
URL: http://svn.apache.org/viewvc?rev=1199361&view=rev
Log:
Add missing null check in QueryProcessor
patch by slebresne; reviewed by jbellis for CASSANDRA-3473
Modified:
cassandra/branches/cassandra-1.0/CHANGES.txt
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/QueryProcessor.java
Modified: cassandra/branches/cassandra-1.0/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/CHANGES.txt?rev=1199361&r1=1199360&r2=1199361&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0/CHANGES.txt Tue Nov 8 17:50:12 2011
@@ -1,7 +1,7 @@
1.0.3
* fix invalidate-related test failures (CASSANDRA-3437)
* add next-gen cqlsh to bin/
- * (CQL) fix handling of rows with no columns (CASSANDRA-3424)
+ * (CQL) fix handling of rows with no columns (CASSANDRA-3424, 3473)
Merged from 0.8:
* Make counter shard merging thread safe (CASSANDRA-3178)
* fix updating CF row_cache_provider (CASSANDRA-3414)
Modified:
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/QueryProcessor.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/QueryProcessor.java?rev=1199361&r1=1199360&r2=1199361&view=diff
==============================================================================
---
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/QueryProcessor.java
(original)
+++
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/QueryProcessor.java
Tue Nov 8 17:50:12 2011
@@ -622,6 +622,9 @@ public class QueryProcessor
continue;
}
+ if (row.cf == null)
+ continue;
+
ByteBuffer name;
try
{
