andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correctly handle the case when no ResourceLeakTracker was created for derived pooled buffers. This was missed in c2f4daa739

Browse Source
This commit is contained in:
Norman Maurer 2016-12-04 23:09:23 +01:00
parent fc1cdc991e
commit 13a8ebade4
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
buffer/src/main/java/io/netty/buffer/SimpleLeakAwareByteBuf.java
View File

@ -137,16 +137,15 @@ class SimpleLeakAwareByteBuf extends WrappedByteBuf {
ByteBuf unwrappedDerived = unwrapSwapped(derived); ByteBuf unwrappedDerived = unwrapSwapped(derived);
if (unwrappedDerived instanceof AbstractPooledDerivedByteBuf) { if (unwrappedDerived instanceof AbstractPooledDerivedByteBuf) {
// Update the parent to point to this buffer so we correctly close the ResourceLeakTracker.
((AbstractPooledDerivedByteBuf) unwrappedDerived).parent(this);
ResourceLeakTracker<ByteBuf> newLeak = AbstractByteBuf.leakDetector.track(derived); ResourceLeakTracker<ByteBuf> newLeak = AbstractByteBuf.leakDetector.track(derived);
if (newLeak == null) { if (newLeak == null) {
// No leak detection, just return the derived buffer. // No leak detection, just return the derived buffer.
return derived; return derived;
} }
ByteBuf leakAwareBuf = newLeakAwareByteBuf(derived, newLeak); return newLeakAwareByteBuf(derived, newLeak);
// Update the parent to point to this buffer.
((AbstractPooledDerivedByteBuf) unwrappedDerived).parent(this);
return leakAwareBuf;
} }
return newSharedLeakAwareByteBuf(derived); return newSharedLeakAwareByteBuf(derived);
} }