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

Merge branch '5.1.x'

Browse Source
This commit is contained in:
Rossen Stoyanchev
2019-04-10 15:37:02 -04:00
parent 88e3b84164 bd2c213b47
commit bb28477587
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-core/src/test/java/org/springframework/core/io/buffer/LeakAwareDataBuffer.java
View File

@@ -37,8 +37,6 @@ class LeakAwareDataBuffer implements PooledDataBuffer {
private final LeakAwareDataBufferFactory dataBufferFactory;
private int refCount = 1;
LeakAwareDataBuffer(DataBuffer delegate, LeakAwareDataBufferFactory dataBufferFactory) {
Assert.notNull(delegate, "Delegate must not be null");
@@ -67,19 +65,24 @@ class LeakAwareDataBuffer implements PooledDataBuffer {
@Override
public boolean isAllocated() {
return this.refCount > 0;
return this.delegate instanceof PooledDataBuffer &&
((PooledDataBuffer) this.delegate).isAllocated();
}
@Override
public PooledDataBuffer retain() {
this.refCount++;
if (this.delegate instanceof PooledDataBuffer) {
((PooledDataBuffer) this.delegate).retain();
}
return this;
}
@Override
public boolean release() {
this.refCount--;
return this.refCount == 0;
if (this.delegate instanceof PooledDataBuffer) {
((PooledDataBuffer) this.delegate).release();
}
return isAllocated();
}
// delegation

6
spring-core/src/test/java/org/springframework/core/io/buffer/LeakAwareDataBufferFactory.java
View File

@@ -99,16 +99,16 @@ public class LeakAwareDataBufferFactory implements DataBufferFactory {
@Override
public DataBuffer allocateBuffer() {
return allocateBufferInternal(this.delegate.allocateBuffer());
return createLeakAwareDataBuffer(this.delegate.allocateBuffer());
}
@Override
public DataBuffer allocateBuffer(int initialCapacity) {
return allocateBufferInternal(this.delegate.allocateBuffer(initialCapacity));
return createLeakAwareDataBuffer(this.delegate.allocateBuffer(initialCapacity));
}
@NotNull
private DataBuffer allocateBufferInternal(DataBuffer delegateBuffer) {
private DataBuffer createLeakAwareDataBuffer(DataBuffer delegateBuffer) {
LeakAwareDataBuffer dataBuffer = new LeakAwareDataBuffer(delegateBuffer, this);
this.created.add(dataBuffer);
return dataBuffer;