You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2011/07/20 16:53:20 UTC
svn commit: r1148805 -
/cassandra/trunk/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
Author: jbellis
Date: Wed Jul 20 14:53:19 2011
New Revision: 1148805
URL: http://svn.apache.org/viewvc?rev=1148805&view=rev
Log:
clarify that BBU.read doesn't allocate arrays unnecessarily
Modified:
cassandra/trunk/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
Modified: cassandra/trunk/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/utils/ByteBufferUtil.java?rev=1148805&r1=1148804&r2=1148805&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/utils/ByteBufferUtil.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/utils/ByteBufferUtil.java Wed Jul 20 14:53:19 2011
@@ -382,20 +382,12 @@ public class ByteBufferUtil
private static ByteBuffer read(DataInput in, int length) throws IOException
{
- ByteBuffer array;
-
if (in instanceof FileDataInput)
- {
- array = ((FileDataInput) in).readBytes(length);
- }
- else
- {
- byte[] buff = new byte[length];
- in.readFully(buff);
- array = ByteBuffer.wrap(buff);
- }
+ return ((FileDataInput) in).readBytes(length);
- return array;
+ byte[] buff = new byte[length];
+ in.readFully(buff);
+ return ByteBuffer.wrap(buff);
}
/**