From c5dc0292e0689f2e714e23495944f6a6a58b5028 Mon Sep 17 00:00:00 2001
From: Sylvain Lebresne <sylvain@datastax.com>
Date: Mon, 13 May 2013 16:31:22 +0200
Subject: [PATCH] Backport #5551 to 1.1

---
 CHANGES.txt                                  | 1 +
 src/java/org/apache/cassandra/dht/Range.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5a559a8a15..7c89987336 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)
diff --git a/src/java/org/apache/cassandra/dht/Range.java b/src/java/org/apache/cassandra/dht/Range.java
index 3f1d41b006..978179ed85 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)