Updated Branches: refs/heads/cassandra-1.2 2e2dd48ff -> f91d320af
Backport #5551 to 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5dc0292 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5dc0292 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5dc0292 Branch: refs/heads/cassandra-1.2 Commit: c5dc0292e0689f2e714e23495944f6a6a58b5028 Parents: ce8bc33 Author: Sylvain Lebresne <[email protected]> Authored: Mon May 13 16:31:22 2013 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Mon May 13 16:31:22 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/dht/Range.java | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5dc0292/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 5a559a8..7c89987 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,6 +3,7 @@ * Use allocator information to improve memtable memory usage estimate (CASSANDRA-5497) * fsync leveled manifest to avoid corruption (CASSANDRA-5535) + * Fix Bound intersection computation (CASSANDRA-5551) 1.1.11 * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5dc0292/src/java/org/apache/cassandra/dht/Range.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/dht/Range.java b/src/java/org/apache/cassandra/dht/Range.java index 3f1d41b..978179e 100644 --- a/src/java/org/apache/cassandra/dht/Range.java +++ b/src/java/org/apache/cassandra/dht/Range.java @@ -137,7 +137,7 @@ public class Range<T extends RingPosition> extends AbstractBounds<T> implements */ public boolean intersects(Bounds<T> that) { - return intersects(new Range<T>(that.left, that.right)) || contains(that.right); + return intersects(new Range<T>(that.left, that.right)) || contains(that.left); } public static <T extends RingPosition> Set<Range<T>> rangeSet(Range<T> ... ranges)
