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 2014/05/29 15:18:44 UTC
[1/2] git commit: Ninja fix for CASSANDRA-7245
Repository: cassandra
Updated Branches:
refs/heads/trunk af593090b -> f2402d253
Ninja fix for CASSANDRA-7245
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/969a9280
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/969a9280
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/969a9280
Branch: refs/heads/trunk
Commit: 969a92804d5d56734c121c2a473752750266f409
Parents: ef41567
Author: Jake Luciani <ja...@apache.org>
Authored: Thu May 29 09:13:23 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Thu May 29 09:13:23 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/transport/CBUtil.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/969a9280/src/java/org/apache/cassandra/transport/CBUtil.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/CBUtil.java b/src/java/org/apache/cassandra/transport/CBUtil.java
index 6ad4682..e5e6f05 100644
--- a/src/java/org/apache/cassandra/transport/CBUtil.java
+++ b/src/java/org/apache/cassandra/transport/CBUtil.java
@@ -303,11 +303,7 @@ public abstract class CBUtil
if (length < 0)
return null;
ByteBuf slice = cb.readSlice(length);
- if (slice.nioBufferCount() > 0)
- return slice.nioBuffer();
- else
- return ByteBuffer.wrap(readRawBytes(cb));
-
+ return ByteBuffer.wrap(readRawBytes(slice));
}
public static void writeValue(byte[] bytes, ByteBuf cb)
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f2402d25
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f2402d25
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f2402d25
Branch: refs/heads/trunk
Commit: f2402d253294943c598667ed7dd1ee09b8833e42
Parents: af59309 969a928
Author: Jake Luciani <ja...@apache.org>
Authored: Thu May 29 09:18:23 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Thu May 29 09:18:23 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/transport/CBUtil.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------