Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compatibility with covariant return type on JDK 9's ByteBuffer

Browse Source 
Issue: SPR-15686
This commit is contained in:
Juergen Hoeller
2017-06-26 23:22:28 +02:00
parent cea1a0f1ca
commit 41eaf03bc8
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java
View File

@@ -29,11 +29,12 @@ import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
/**
* Default implementation of the {@link DataBuffer} interface that uses a {@link
* ByteBuffer} internally, with separate read and write positions. Constructed
* using the {@link DefaultDataBufferFactory}.
* Default implementation of the {@link DataBuffer} interface that uses a
* {@link ByteBuffer} internally, with separate read and write positions.
* Constructed using the {@link DefaultDataBufferFactory}.
*
* @author Arjen Poutsma
* @author Juergen Hoeller
* @since 5.0
* @see DefaultDataBufferFactory
*/
@@ -304,15 +305,16 @@ public class DefaultDataBuffer implements DataBuffer {
(oldBuffer.isDirect() ? ByteBuffer.allocateDirect(capacity) :
ByteBuffer.allocate(capacity));
// Explicit cast for compatibility with covariant return type on JDK 9's ByteBuffer
final int remaining = readableByteCount();
// Explicit cast for compatibility with covariant return type on JDK 9's ByteBuffer
((Buffer) oldBuffer).position(this.readPosition).limit(this.writePosition);
newBuffer.put(oldBuffer);
this.byteBuffer = newBuffer;
this.readPosition = 0;
this.writePosition = remaining;
oldBuffer.clear();
// Explicit cast for compatibility with covariant return type on JDK 9's ByteBuffer
((Buffer) oldBuffer).clear();
}