Test for ByteBuffer-to-ByteBuffer conversion (fresh copy)

ByteBufferConverter also defensively returns the rewind result now.

Issue: SPR-13031
This commit is contained in:
Juergen Hoeller
2015-05-18 16:17:11 +02:00
parent 1e7d954fcb
commit 008c9a3b45
2 changed files with 19 additions and 11 deletions

View File

@@ -97,6 +97,7 @@ final class ByteBufferConverter implements ConditionalGenericConverter {
private Object convertFromByteBuffer(ByteBuffer source, TypeDescriptor targetType) {
byte[] bytes = new byte[source.remaining()];
source.get(bytes);
if (targetType.isAssignableTo(BYTE_ARRAY_TYPE)) {
return bytes;
}
@@ -113,9 +114,7 @@ final class ByteBufferConverter implements ConditionalGenericConverter {
// Extra cast necessary for compiling on JDK 9 plus running on JDK 8, since
// otherwise the overridden ByteBuffer-returning rewind method would be chosen
// which isn't available on JDK 8.
((Buffer) byteBuffer).rewind();
return byteBuffer;
return ((Buffer) byteBuffer).rewind();
}
}