cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eev...@apache.org
Subject svn commit: r1096931 - /cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/WhereClause.java
Date Tue, 26 Apr 2011 22:12:59 GMT
Author: eevans
Date: Tue Apr 26 22:12:59 2011
New Revision: 1096931

URL: http://svn.apache.org/viewvc?rev=1096931&view=rev
Log:
NPE running SELECT with an IN clause

Patch by eevans; reviewed by jbellis for CASSANDRA-2538

Modified:
    cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/WhereClause.java

Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/WhereClause.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/WhereClause.java?rev=1096931&r1=1096930&r2=1096931&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/WhereClause.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/WhereClause.java Tue
Apr 26 22:12:59 2011
@@ -56,7 +56,7 @@ public class WhereClause
      */
     public void and(Relation relation)
     {
-        if (relation.isKey())
+        if ((relation != null) && relation.isKey())
         {
             if (relation.operator().equals(RelationType.EQ))
                 keys.add(relation.getValue());



Mime
View raw message