Updated Branches: refs/heads/trunk fba541c0c -> 45e1d5188
Fix RangeTest.java compilation error on Range.rangeSet in Eclipse Patch by Kirk True; reviewed by tjake for CASSANDRA-3784 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/45e1d518 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45e1d518 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45e1d518 Branch: refs/heads/trunk Commit: 45e1d5188c42dd0220a51af1b574af3c4d8378ea Parents: fba541c Author: T Jake Luciani <[email protected]> Authored: Wed Jan 25 16:26:02 2012 -0500 Committer: T Jake Luciani <[email protected]> Committed: Wed Jan 25 16:26:02 2012 -0500 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/dht/RangeTest.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/45e1d518/test/unit/org/apache/cassandra/dht/RangeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/dht/RangeTest.java b/test/unit/org/apache/cassandra/dht/RangeTest.java index dc951f8..42554c0 100644 --- a/test/unit/org/apache/cassandra/dht/RangeTest.java +++ b/test/unit/org/apache/cassandra/dht/RangeTest.java @@ -179,9 +179,9 @@ public class RangeTest assert not.intersects(twowrap); } - static void assertIntersection(Range one, Range two, Range ... ranges) + static <T extends RingPosition> void assertIntersection(Range one, Range two, Range<T> ... ranges) { - Set<Range> correct = Range.rangeSet(ranges); + Set<Range<T>> correct = Range.rangeSet(ranges); Set<Range> result1 = one.intersectionWith(two); assert result1.equals(correct) : String.format("%s != %s", StringUtils.join(result1, ","),
