You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/04/30 05:06:26 UTC
[1/2] git commit: fix equals to compare this to the parm,
rather than this to this
Repository: cassandra
Updated Branches:
refs/heads/trunk d30b74515 -> c06ba25a5
fix equals to compare this to the parm, rather than this to this
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b5b7f51
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b5b7f51
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b5b7f51
Branch: refs/heads/trunk
Commit: 6b5b7f5193c63d19fe644c708efe100f6f520fa1
Parents: 02ffaff
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue Apr 29 23:04:20 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue Apr 29 23:04:48 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/NativeCounterCell.java | 2 +-
src/java/org/apache/cassandra/db/NativeExpiringCell.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b5b7f51/src/java/org/apache/cassandra/db/NativeCounterCell.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/NativeCounterCell.java b/src/java/org/apache/cassandra/db/NativeCounterCell.java
index abcf598..2828e13 100644
--- a/src/java/org/apache/cassandra/db/NativeCounterCell.java
+++ b/src/java/org/apache/cassandra/db/NativeCounterCell.java
@@ -180,7 +180,7 @@ public class NativeCounterCell extends NativeCell implements CounterCell
public boolean equals(Cell cell)
{
- return cell instanceof CounterCell && equals((CounterCell) this);
+ return cell instanceof CounterCell && equals((CounterCell) cell);
}
public boolean equals(CounterCell cell)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b5b7f51/src/java/org/apache/cassandra/db/NativeExpiringCell.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/NativeExpiringCell.java b/src/java/org/apache/cassandra/db/NativeExpiringCell.java
index 5ac0e81..0822fbd 100644
--- a/src/java/org/apache/cassandra/db/NativeExpiringCell.java
+++ b/src/java/org/apache/cassandra/db/NativeExpiringCell.java
@@ -130,7 +130,7 @@ public class NativeExpiringCell extends NativeCell implements ExpiringCell
public boolean equals(Cell cell)
{
- return cell instanceof ExpiringCell && equals((ExpiringCell) this);
+ return cell instanceof ExpiringCell && equals((ExpiringCell) cell);
}
protected boolean equals(ExpiringCell cell)
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c06ba25a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c06ba25a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c06ba25a
Branch: refs/heads/trunk
Commit: c06ba25a51256324c68e958fec3298fc2f58983b
Parents: d30b745 6b5b7f5
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue Apr 29 23:05:35 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue Apr 29 23:05:35 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/NativeCounterCell.java | 2 +-
src/java/org/apache/cassandra/db/NativeExpiringCell.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------