Fix EpollSocketTestPermutation after bad cherry-pick
This commit is contained in:
parent
e5ff6216ff
commit
06ddb1f45e
@ -91,10 +91,10 @@ class EpollSocketTestPermutation extends SocketTestPermutation {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<BootstrapFactory<Bootstrap>> clientSocket() {
|
public List<BootstrapFactory<Bootstrap>> clientSocket() {
|
||||||
return Arrays.asList(
|
List<BootstrapFactory<Bootstrap>> toReturn = new ArrayList<BootstrapFactory<Bootstrap>>();
|
||||||
() -> new Bootstrap().group(EPOLL_WORKER_GROUP).channel(EpollSocketChannel.class),
|
toReturn.add(() -> new Bootstrap().group(EPOLL_WORKER_GROUP).channel(EpollSocketChannel.class));
|
||||||
() -> new Bootstrap().group(nioWorkerGroup).channel(NioSocketChannel.class)
|
toReturn.add(() -> new Bootstrap().group(nioWorkerGroup).channel(NioSocketChannel.class));
|
||||||
);
|
return toReturn;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -103,13 +103,8 @@ class EpollSocketTestPermutation extends SocketTestPermutation {
|
|||||||
|
|
||||||
if (IS_SUPPORTING_TCP_FASTOPEN_CLIENT) {
|
if (IS_SUPPORTING_TCP_FASTOPEN_CLIENT) {
|
||||||
int insertIndex = factories.size() - 1; // Keep NIO fixture last.
|
int insertIndex = factories.size() - 1; // Keep NIO fixture last.
|
||||||
factories.add(insertIndex, new BootstrapFactory<Bootstrap>() {
|
factories.add(insertIndex, () -> new Bootstrap().group(EPOLL_WORKER_GROUP).channel(EpollSocketChannel.class)
|
||||||
@Override
|
.option(ChannelOption.TCP_FASTOPEN_CONNECT, true));
|
||||||
public Bootstrap newInstance() {
|
|
||||||
return new Bootstrap().group(EPOLL_WORKER_GROUP).channel(EpollSocketChannel.class)
|
|
||||||
.option(ChannelOption.TCP_FASTOPEN_CONNECT, true);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
return clientSocket();
|
return clientSocket();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user