convert position checks to assert and remove redundant FreeableMemory.getByte
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/98721bfc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98721bfc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/98721bfc Branch: refs/heads/trunk Commit: 98721bfcaebd90672a7a94d566a07ca1619152d3 Parents: 438e753 Author: Jonathan Ellis <[email protected]> Authored: Thu Oct 25 22:55:56 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Oct 26 01:06:17 2012 -0700 ---------------------------------------------------------------------- .../org/apache/cassandra/cache/FreeableMemory.java | 7 ------- src/java/org/apache/cassandra/io/util/Memory.java | 7 ++----- 2 files changed, 2 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/98721bfc/src/java/org/apache/cassandra/cache/FreeableMemory.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cache/FreeableMemory.java b/src/java/org/apache/cassandra/cache/FreeableMemory.java index 677f915..d088b6d 100644 --- a/src/java/org/apache/cassandra/cache/FreeableMemory.java +++ b/src/java/org/apache/cassandra/cache/FreeableMemory.java @@ -52,11 +52,4 @@ public class FreeableMemory extends Memory if (references.decrementAndGet() == 0) free(); } - - @Override - public byte getByte(long offset) - { - assert peer != 0; - return super.getByte(offset); - } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/98721bfc/src/java/org/apache/cassandra/io/util/Memory.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/util/Memory.java b/src/java/org/apache/cassandra/io/util/Memory.java index eeec678..73f6a96 100644 --- a/src/java/org/apache/cassandra/io/util/Memory.java +++ b/src/java/org/apache/cassandra/io/util/Memory.java @@ -121,11 +121,8 @@ public class Memory private void checkPosition(long offset) { - if (peer == 0) - throw new IllegalStateException("Memory was freed"); - - if (offset < 0 || offset >= size) - throw new IndexOutOfBoundsException("Illegal offset: " + offset + ", size: " + size); + assert peer != 0 : "Memory was freed"; + assert offset >= 0 && offset < size : "Illegal offset: " + offset + ", size: " + size; } public void free()
