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

Merge branch 'master' of github.com:netty/netty

Browse Source
This commit is contained in:
Norman Maurer 2012-06-04 20:34:16 +02:00
commit 0e74b089c2
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
View File

@ -765,8 +765,7 @@ public class DefaultChannelPipeline implements ChannelPipeline {
if (ctx == null) {
return false;
}
ChannelBufferHolder<Object> in = ctx.in;
if (in != null && !in.isBypass() && in.hasByteBuffer()) {
if (ctx.inByteBridge != null) {
return true;
}
ctx = ctx.next;
@ -778,8 +777,7 @@ public class DefaultChannelPipeline implements ChannelPipeline {
if (ctx == null) {
return false;
}
ChannelBufferHolder<Object> in = ctx.inbound();
if (in != null && !in.isBypass() && in.hasMessageBuffer()) {
if (ctx.inMsgBridge != null) {
return true;
}
ctx = ctx.next;
@ -843,8 +841,7 @@ public class DefaultChannelPipeline implements ChannelPipeline {
return false;
}
ChannelBufferHolder<Object> out = ctx.outbound();
if (out != null && !out.isBypass() && out.hasByteBuffer()) {
if (ctx.outByteBridge != null) {
return true;
}
ctx = ctx.prev;
@ -857,8 +854,7 @@ public class DefaultChannelPipeline implements ChannelPipeline {
return false;
}
ChannelBufferHolder<Object> out = ctx.outbound();
if (out != null && !out.isBypass() && out.hasMessageBuffer()) {
if (ctx.outMsgBridge != null) {
return true;
}
ctx = ctx.prev;