Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 36dc512ad -> 6065f2c8a refs/heads/trunk 555f89c5a -> e034d3fd7
ninja fix patch application Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6065f2c8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6065f2c8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6065f2c8 Branch: refs/heads/cassandra-2.1 Commit: 6065f2c8a79ccbd2b203929dda7237af1ca80402 Parents: 36dc512 Author: Benedict Elliott Smith <[email protected]> Authored: Thu Feb 19 12:13:14 2015 +0000 Committer: Benedict Elliott Smith <[email protected]> Committed: Thu Feb 19 12:13:14 2015 +0000 ---------------------------------------------------------------------- src/java/org/apache/cassandra/io/util/SafeMemory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6065f2c8/src/java/org/apache/cassandra/io/util/SafeMemory.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/util/SafeMemory.java b/src/java/org/apache/cassandra/io/util/SafeMemory.java index d722348..74a1f1e 100644 --- a/src/java/org/apache/cassandra/io/util/SafeMemory.java +++ b/src/java/org/apache/cassandra/io/util/SafeMemory.java @@ -90,9 +90,9 @@ public class SafeMemory extends Memory implements SharedCloseable } @Inline - protected void checkPosition(long offset) + protected void checkBounds(long start, long end) { assert peer != 0 || size == 0 : ref.printDebugInfo(); - super.checkPosition(offset); + super.checkBounds(start, end); } }
