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

Fix possible NPE which accour if the inbound/outbound buffer was not lazy allocated yet

Browse Source
This commit is contained in:
Norman Maurer 2012-12-06 19:36:53 +01:00
parent 51e6519b67
commit 16b05def59
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
transport/src/main/java/io/netty/channel/DefaultChannelHandlerContext.java
View File

@ -160,10 +160,14 @@ final class DefaultChannelHandlerContext extends DefaultAttributeMap implements
if (ctx.handler instanceof ChannelInboundHandler) {
ChannelInboundHandler h = (ChannelInboundHandler) ctx.handler;
try {
if (ctx.inByteBuf != null) {
h.freeInboundBuffer(ctx, ctx.inByteBuf);
if (ctx.hasInboundByteBuffer()) {
if (ctx.inByteBuf != null) {
h.freeInboundBuffer(ctx, ctx.inByteBuf);
}
} else {
h.freeInboundBuffer(ctx, ctx.inMsgBuf);
if (ctx.inMsgBuf != null) {
h.freeInboundBuffer(ctx, ctx.inMsgBuf);
}
}
} catch (Throwable t) {
pipeline.notifyHandlerException(t);
@ -186,10 +190,14 @@ final class DefaultChannelHandlerContext extends DefaultAttributeMap implements
if (ctx.handler instanceof ChannelOutboundHandler) {
ChannelOutboundHandler h = (ChannelOutboundHandler) ctx.handler;
try {
if (ctx.outByteBuf != null) {
h.freeOutboundBuffer(ctx, ctx.outByteBuf);
if (ctx.hasOutboundByteBuffer()) {
if (ctx.outByteBuf != null) {
h.freeOutboundBuffer(ctx, ctx.outByteBuf);
}
} else {
h.freeOutboundBuffer(ctx, ctx.outMsgBuf);
if (ctx.outMsgBuf != null) {
h.freeOutboundBuffer(ctx, ctx.outMsgBuf);
}
}
} catch (Throwable t) {
pipeline.notifyHandlerException(t);