Updated Branches:
  refs/heads/trunk 44b7b7a62 -> 298606afd

better assertion message to help with issues like CASSANDRA-4976


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

Branch: refs/heads/trunk
Commit: 298606afdc5d0caf5e47bc8aac327d46e67111d2
Parents: 44b7b7a
Author: Dave Brosius <[email protected]>
Authored: Wed Nov 21 02:08:37 2012 -0500
Committer: Dave Brosius <[email protected]>
Committed: Wed Nov 21 02:08:37 2012 -0500

----------------------------------------------------------------------
 .../org/apache/cassandra/db/CounterColumn.java     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/298606af/src/java/org/apache/cassandra/db/CounterColumn.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/CounterColumn.java 
b/src/java/org/apache/cassandra/db/CounterColumn.java
index 1c5fdcd..f8be750 100644
--- a/src/java/org/apache/cassandra/db/CounterColumn.java
+++ b/src/java/org/apache/cassandra/db/CounterColumn.java
@@ -113,7 +113,7 @@ public class CounterColumn extends Column
     @Override
     public IColumn diff(IColumn column)
     {
-        assert column instanceof CounterColumn : "Wrong class type.";
+        assert column instanceof CounterColumn : "Wrong class type. " + 
((column == null) ? "null" : column.getClass().getSimpleName()) + " found.";
 
         if (timestamp() < column.timestamp())
             return column;

Reply via email to