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

Fix a bug where the unpooled buffer returned by the pooled allocator reports an incorrect allocator

Browse Source
This commit is contained in:
Trustin Lee 2013-05-01 11:14:21 +09:00
parent 23d0178494
commit 2e0dd65250
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
buffer/src/main/java/io/netty/buffer/PooledByteBufAllocator.java
View File

@ -82,7 +82,6 @@ public class PooledByteBufAllocator extends AbstractByteBufAllocator {
private final PoolArena<byte[]>[] heapArenas;
private final PoolArena<ByteBuffer>[] directArenas;
private final UnpooledByteBufAllocator unpooledAllocator;
final ThreadLocal<PoolThreadCache> threadCache = new ThreadLocal<PoolThreadCache>() {
private final AtomicInteger index = new AtomicInteger();
@ -151,8 +150,6 @@ public class PooledByteBufAllocator extends AbstractByteBufAllocator {
} else {
directArenas = null;
}
unpooledAllocator = new UnpooledByteBufAllocator(preferDirect);
}
@SuppressWarnings("unchecked")
@ -208,7 +205,7 @@ public class PooledByteBufAllocator extends AbstractByteBufAllocator {
if (heapArena != null) {
return heapArena.allocate(cache, initialCapacity, maxCapacity);
} else {
return unpooledAllocator.newDirectBuffer(initialCapacity, maxCapacity);
return new UnpooledHeapByteBuf(this, initialCapacity, maxCapacity);
}
}
@ -219,7 +216,11 @@ public class PooledByteBufAllocator extends AbstractByteBufAllocator {
if (directArena != null) {
return directArena.allocate(cache, initialCapacity, maxCapacity);
} else {
return unpooledAllocator.newDirectBuffer(initialCapacity, maxCapacity);
if (PlatformDependent.hasUnsafe()) {
return new UnpooledUnsafeDirectByteBuf(this, initialCapacity, maxCapacity);
} else {
return new UnpooledDirectByteBuf(this, initialCapacity, maxCapacity);
}
}
}