You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2013/08/14 14:10:48 UTC
[1/2] git commit: ninja fix for missing buffer offsets in
CASSANDRA-5884
Updated Branches:
refs/heads/trunk a69457c14 -> 633cfbc7c
ninja fix for missing buffer offsets in CASSANDRA-5884
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/65f189b9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65f189b9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65f189b9
Branch: refs/heads/trunk
Commit: 65f189b9d0520ce9d6a2ed8742d227e60a3e76d4
Parents: 9e846d9
Author: Jake Luciani <ja...@apache.org>
Authored: Wed Aug 14 08:07:41 2013 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Wed Aug 14 08:07:54 2013 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/util/Memory.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/65f189b9/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 b98dded..91c601d 100644
--- a/src/java/org/apache/cassandra/io/util/Memory.java
+++ b/src/java/org/apache/cassandra/io/util/Memory.java
@@ -96,7 +96,7 @@ public class Memory
long end = memoryOffset + count;
checkPosition(end - 1);
- unsafe.copyMemory(buffer, BYTE_ARRAY_BASE_OFFSET, null, peer + memoryOffset, count);
+ unsafe.copyMemory(buffer, BYTE_ARRAY_BASE_OFFSET + bufferOffset, null, peer + memoryOffset, count);
}
public byte getByte(long offset)
@@ -138,7 +138,7 @@ public class Memory
long end = memoryOffset + count;
checkPosition(end - 1);
- unsafe.copyMemory(null, peer + memoryOffset, buffer, BYTE_ARRAY_BASE_OFFSET, count);
+ unsafe.copyMemory(null, peer + memoryOffset, buffer, BYTE_ARRAY_BASE_OFFSET + bufferOffset, count);
}
private void checkPosition(long offset)
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/633cfbc7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/633cfbc7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/633cfbc7
Branch: refs/heads/trunk
Commit: 633cfbc7c32081502f30f50599c342ac4b8a2930
Parents: a69457c 65f189b
Author: Jake Luciani <ja...@apache.org>
Authored: Wed Aug 14 08:10:30 2013 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Wed Aug 14 08:10:30 2013 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/util/Memory.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------