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

[#2297] Correctly close all registered Channels on EpollEventLoop.closeAll()

Browse Source
This commit is contained in:
Norman Maurer 2014-03-10 20:27:44 +01:00
parent c31e8f59ba
commit 3c359cfde5
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollEventLoop.java
View File

@ -289,17 +289,11 @@ final class EpollEventLoop extends SingleThreadEventLoop {
}
private void closeAll() {
int ready = Native.epollWait(epollFd, events, 0);
Collection<AbstractEpollChannel> channels = new ArrayList<AbstractEpollChannel>(ready);
Native.epollWait(epollFd, events, 0);
Collection<AbstractEpollChannel> channels = new ArrayList<AbstractEpollChannel>(ids.size());
for (int i = 0; i < ready; i++) {
final long ev = events[i];
int id = (int) (ev >> 32L);
AbstractEpollChannel ch = ids.get(id);
if (ch != null) {
channels.add(ids.get(id));
}
for (AbstractEpollChannel ch: ids.values()) {
channels.add(ch);
}
for (AbstractEpollChannel ch: channels) {