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

Fix check to clear READ_OP and EPOLLIN. Part of [#2254]

Browse Source
This commit is contained in:
Norman Maurer 2014-02-22 20:06:21 +01:00
parent 52535a12f8
commit 01cd5929da
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollServerSocketChannel.java
View File

@ -132,7 +132,7 @@ public final class EpollServerSocketChannel extends AbstractEpollChannel impleme
// * The user called Channel.read() or ChannelHandlerContext.read() in channelReadComplete(...) method // * The user called Channel.read() or ChannelHandlerContext.read() in channelReadComplete(...) method
// //
// See https://github.com/netty/netty/issues/2254 // See https://github.com/netty/netty/issues/2254
if (config.isAutoRead() && !readPending) { if (!config.isAutoRead() && !readPending) {
clearEpollIn(); clearEpollIn();
} }
} }

2
transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollSocketChannel.java
View File

@ -648,7 +648,7 @@ public final class EpollSocketChannel extends AbstractEpollChannel implements So
// * The user called Channel.read() or ChannelHandlerContext.read() in channelReadComplete(...) method // * The user called Channel.read() or ChannelHandlerContext.read() in channelReadComplete(...) method
// //
// See https://github.com/netty/netty/issues/2254 // See https://github.com/netty/netty/issues/2254
if (config.isAutoRead() && !readPending) { if (!config.isAutoRead() && !readPending) {
clearEpollIn(); clearEpollIn();
} }
} }

2
transport/src/main/java/io/netty/channel/nio/AbstractNioByteChannel.java
View File

@ -153,7 +153,7 @@ public abstract class AbstractNioByteChannel extends AbstractNioChannel {
// * The user called Channel.read() or ChannelHandlerContext.read() in channelReadComplete(...) method // * The user called Channel.read() or ChannelHandlerContext.read() in channelReadComplete(...) method
// //
// See https://github.com/netty/netty/issues/2254 // See https://github.com/netty/netty/issues/2254
if (config.isAutoRead() && !readPending) { if (!config.isAutoRead() && !readPending) {
removeReadOp(); removeReadOp();
} }
} }

2
transport/src/main/java/io/netty/channel/nio/AbstractNioMessageChannel.java
View File

@ -111,7 +111,7 @@ public abstract class AbstractNioMessageChannel extends AbstractNioChannel {
// * The user called Channel.read() or ChannelHandlerContext.read() in channelReadComplete(...) method // * The user called Channel.read() or ChannelHandlerContext.read() in channelReadComplete(...) method
// //
// See https://github.com/netty/netty/issues/2254 // See https://github.com/netty/netty/issues/2254
if (config.isAutoRead() && !readPending) { if (!config.isAutoRead() && !readPending) {
removeReadOp(); removeReadOp();
} }
} }