From 2e2dd48ff911a84ef46dae3fe05331ce8f669791 Mon Sep 17 00:00:00 2001
From: Sylvain Lebresne <sylvain@datastax.com>
Date: Mon, 13 May 2013 12:11:08 +0200
Subject: [PATCH] Fix intersection with Bound computation

patch by wy96f; reviewed by slebresne for CASSANDRA-5551
---
 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 dfe30152c7..cf218d6025 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -23,6 +23,7 @@
  * Add custom secondary index support to CQL3 (CASSANDRA-5484)
  * Fix repair hanging silently on unexpected error (CASSANDRA-5229)
  * Fix Ec2Snitch regression introduced by CASSANDRA-5171 (CASSANDRA-5432)
+ * Fix Bound intersection computation (CASSANDRA-5551)
 Merged from 1.1
  * Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393)
  * Use allocator information to improve memtable memory usage estimate
diff --git a/src/java/org/apache/cassandra/dht/Range.java b/src/java/org/apache/cassandra/dht/Range.java
index 99286fed82..c2d7b639f4 100644
--- a/src/java/org/apache/cassandra/dht/Range.java
+++ b/src/java/org/apache/cassandra/dht/Range.java
@@ -136,7 +136,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)