From 8c68c5a3ae4d3d907528b64ec4b3daa5512d4be6 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Sat, 22 Feb 2014 20:06:21 +0100 Subject: [PATCH] Fix check to clear READ_OP and EPOLLIN. Part of [#2254] --- .../java/io/netty/channel/epoll/EpollServerSocketChannel.java | 2 +- .../main/java/io/netty/channel/epoll/EpollSocketChannel.java | 2 +- .../main/java/io/netty/channel/nio/AbstractNioByteChannel.java | 2 +- .../java/io/netty/channel/nio/AbstractNioMessageChannel.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollServerSocketChannel.java b/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollServerSocketChannel.java index 4a9cebd38d..390ca3d0e8 100644 --- a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollServerSocketChannel.java +++ b/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollServerSocketChannel.java @@ -123,7 +123,7 @@ public final class EpollServerSocketChannel extends AbstractEpollChannel impleme // * The user called Channel.read() or ChannelHandlerContext.read() in channelReadComplete(...) method // // See https://github.com/netty/netty/issues/2254 - if (config.isAutoRead() && !readPending) { + if (!config.isAutoRead() && !readPending) { clearEpollIn(); } } diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollSocketChannel.java b/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollSocketChannel.java index edb12876dd..494d71c5ae 100644 --- a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollSocketChannel.java +++ b/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollSocketChannel.java @@ -648,7 +648,7 @@ public final class EpollSocketChannel extends AbstractEpollChannel implements So // * The user called Channel.read() or ChannelHandlerContext.read() in channelReadComplete(...) method // // See https://github.com/netty/netty/issues/2254 - if (config.isAutoRead() && !readPending) { + if (!config.isAutoRead() && !readPending) { clearEpollIn(); } } diff --git a/transport/src/main/java/io/netty/channel/nio/AbstractNioByteChannel.java b/transport/src/main/java/io/netty/channel/nio/AbstractNioByteChannel.java index 8815a23b90..4a5e1dfac8 100644 --- a/transport/src/main/java/io/netty/channel/nio/AbstractNioByteChannel.java +++ b/transport/src/main/java/io/netty/channel/nio/AbstractNioByteChannel.java @@ -152,7 +152,7 @@ public abstract class AbstractNioByteChannel extends AbstractNioChannel { // * The user called Channel.read() or ChannelHandlerContext.read() in channelReadComplete(...) method // // See https://github.com/netty/netty/issues/2254 - if (config.isAutoRead() && !readPending) { + if (!config.isAutoRead() && !readPending) { removeReadOp(); } } diff --git a/transport/src/main/java/io/netty/channel/nio/AbstractNioMessageChannel.java b/transport/src/main/java/io/netty/channel/nio/AbstractNioMessageChannel.java index d96200de50..47581cc698 100644 --- a/transport/src/main/java/io/netty/channel/nio/AbstractNioMessageChannel.java +++ b/transport/src/main/java/io/netty/channel/nio/AbstractNioMessageChannel.java @@ -112,7 +112,7 @@ public abstract class AbstractNioMessageChannel extends AbstractNioChannel { // * The user called Channel.read() or ChannelHandlerContext.read() in channelReadComplete(...) method // // See https://github.com/netty/netty/issues/2254 - if (config.isAutoRead() && !readPending) { + if (!config.isAutoRead() && !readPending) { removeReadOp(); } }