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

Switch to Reactor snapshots and remove workaround

Browse Source 
Following the 5.2 M1 release we can switch back to Reactor snapshots
and remove the workaround for a fix coming in Reactor Core 3.2.9.
This commit is contained in:
Rossen Stoyanchev
2019-04-10 16:09:28 -04:00
parent bb28477587
commit 6e7da62085
4 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketBufferLeakTests.java
View File

@@ -238,9 +238,10 @@ public class RSocketBufferLeakTests {
/**
* Similar {@link org.springframework.core.io.buffer.LeakAwareDataBufferFactory}
* but extends {@link NettyDataBufferFactory} rather than rely on
* decoration, since {@link PayloadUtils} does instanceof checks.
* Unlike {@link org.springframework.core.io.buffer.LeakAwareDataBufferFactory}
* this one is an instance of {@link NettyDataBufferFactory} which is necessary
* since {@link PayloadUtils} does instanceof checks, and that also allows
* intercepting {@link NettyDataBufferFactory#wrap(ByteBuf)}.
*/
private static class LeakAwareNettyDataBufferFactory extends NettyDataBufferFactory {
@@ -277,32 +278,33 @@ public class RSocketBufferLeakTests {
@Override
public NettyDataBuffer allocateBuffer() {
return (NettyDataBuffer) record(super.allocateBuffer());
return (NettyDataBuffer) recordHint(super.allocateBuffer());
}
@Override
public NettyDataBuffer allocateBuffer(int initialCapacity) {
return (NettyDataBuffer) record(super.allocateBuffer(initialCapacity));
return (NettyDataBuffer) recordHint(super.allocateBuffer(initialCapacity));
}
@Override
public NettyDataBuffer wrap(ByteBuf byteBuf) {
NettyDataBuffer dataBuffer = super.wrap(byteBuf);
if (byteBuf != Unpooled.EMPTY_BUFFER) {
record(dataBuffer);
recordHint(dataBuffer);
}
return dataBuffer;
}
@Override
public DataBuffer join(List<? extends DataBuffer> dataBuffers) {
return record(super.join(dataBuffers));
return recordHint(super.join(dataBuffers));
}
private DataBuffer record(DataBuffer buffer) {
this.created.add(new DataBufferLeakInfo(buffer, new AssertionError(String.format(
private DataBuffer recordHint(DataBuffer buffer) {
AssertionError error = new AssertionError(String.format(
"DataBuffer leak: {%s} {%s} not released.%nStacktrace at buffer creation: ", buffer,
ObjectUtils.getIdentityHexString(((NettyDataBuffer) buffer).getNativeBuffer())))));
ObjectUtils.getIdentityHexString(((NettyDataBuffer) buffer).getNativeBuffer())));
this.created.add(new DataBufferLeakInfo(buffer, error));
return buffer;
}
}