Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-18692 [compat 1-2] ByteBufferUtils.copyFromBufferToBuffer goes from void to int

This commit is contained in:
Michael Stack 2017-08-27 22:22:12 -07:00
parent 5531be160b
commit 5053ed9545
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferUtils.java
View File

@ -395,7 +395,7 @@ public final class ByteBufferUtils {
* @param destinationOffset * @param destinationOffset
* @param length * @param length
*/ */
public static int copyFromBufferToBuffer(ByteBuffer in, ByteBuffer out, int sourceOffset, public static void copyFromBufferToBuffer(ByteBuffer in, ByteBuffer out, int sourceOffset,
int destinationOffset, int length) { int destinationOffset, int length) {
if (in.hasArray() && out.hasArray()) { if (in.hasArray() && out.hasArray()) {
System.arraycopy(in.array(), sourceOffset + in.arrayOffset(), out.array(), out.arrayOffset() System.arraycopy(in.array(), sourceOffset + in.arrayOffset(), out.array(), out.arrayOffset()
@ -409,7 +409,7 @@ public final class ByteBufferUtils {
inDup.position(sourceOffset).limit(sourceOffset + length); inDup.position(sourceOffset).limit(sourceOffset + length);
outDup.put(inDup); outDup.put(inDup);
} }
return destinationOffset + length; // We used to return a result but disabled; return destinationOffset + length;
} }
/** /**