cassandra git commit: Use ColumnDef name for cleaner error message about null conditions

[tylerhobbs]

Repository: cassandra
Updated Branches:
  refs/heads/trunk db900a374 -> 9c482fdcf


Use ColumnDef name for cleaner error message about null conditions

Before this change, the error message would look like:

Invalid null value in condition for column ColumnDefinition{name=key1,
type=org.apache.cassandra.db.marshal.UTF8Type, kind=PARTITION_KEY,
componentIndex=null, indexName=null, indexType=null}


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c482fdc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c482fdc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c482fdc

Branch: refs/heads/trunk
Commit: 9c482fdcf5be36167d60843f6360b3c64c04f0c8
Parents: db900a3
Author: Tyler Hobbs <tylerho...@apache.org>
Authored: Fri Mar 27 13:24:23 2015 -0500
Committer: Tyler Hobbs <tylerho...@apache.org>
Committed: Fri Mar 27 13:24:23 2015 -0500

----------------------------------------------------------------------
 .../cassandra/cql3/restrictions/SingleColumnRestriction.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c482fdc/src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java
----------------------------------------------------------------------
diff --git 
a/src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java 
b/src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java
index 56a10a8..b25d5a4 100644
--- 
a/src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java
+++ 
b/src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java
@@ -132,7 +132,7 @@ public abstract class SingleColumnRestriction extends 
AbstractRestriction
         public CompositesBuilder appendTo(CompositesBuilder builder, 
QueryOptions options)
         {
             builder.addElementToAll(value.bindAndGet(options));
-            checkFalse(builder.containsNull(), "Invalid null value in 
condition for column %s", columnDef);
+            checkFalse(builder.containsNull(), "Invalid null value in 
condition for column %s", columnDef.name);
             return builder;
         }
 
@@ -178,7 +178,7 @@ public abstract class SingleColumnRestriction extends 
AbstractRestriction
         public CompositesBuilder appendTo(CompositesBuilder builder, 
QueryOptions options)
         {
             builder.addEachElementToAll(getValues(options));
-            checkFalse(builder.containsNull(), "Invalid null value in 
condition for column %s", columnDef);
+            checkFalse(builder.containsNull(), "Invalid null value in 
condition for column %s", columnDef.name);
             return builder;
         }