You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/02/15 18:39:47 UTC

git commit: Fix typo in SuperColumn.mostRecentLiveChangeAt()

Updated Branches:
  refs/heads/cassandra-1.1 7f4693dab -> b0c0faeed


Fix typo in SuperColumn.mostRecentLiveChangeAt()

patch by slebresne; reviewed by driftx for CASSANDRA-3917


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

Branch: refs/heads/cassandra-1.1
Commit: b0c0faeed5f22261eea26f2a66dccc921d6a2b83
Parents: 7f4693d
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 15 18:38:07 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 15 18:38:07 2012 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0c0faee/src/java/org/apache/cassandra/db/SuperColumn.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SuperColumn.java b/src/java/org/apache/cassandra/db/SuperColumn.java
index 8089d59..67d1d71 100644
--- a/src/java/org/apache/cassandra/db/SuperColumn.java
+++ b/src/java/org/apache/cassandra/db/SuperColumn.java
@@ -144,7 +144,7 @@ public class SuperColumn extends AbstractColumnContainer implements IColumn
         long max = Long.MIN_VALUE;
         for (IColumn column : getSubColumns())
         {
-            if (column.isMarkedForDelete() && column.timestamp() > max)
+            if (!column.isMarkedForDelete() && column.timestamp() > max)
             {
                 max = column.timestamp();
             }