From 1a72bd09d532a5b9ec3432bdd4d487702d70f937 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Mon, 17 Mar 2014 09:51:16 +0900 Subject: [PATCH] Fix 'incompatible event loop' regression Motivation: Previous commit (2de65e25e90dec5c0a28b2d57e6c6d15d5a49087) introduced a regression that makes the epoll testsuite fail with an 'incompatible event loop' error. Modifications: Use the correct event loop type. Result: Build doesn't fail anymore. --- .../src/test/java/io/netty/channel/epoll/EpollTestUtils.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollTestUtils.java b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollTestUtils.java index 6d09d425df..72382c142f 100644 --- a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollTestUtils.java +++ b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollTestUtils.java @@ -18,7 +18,6 @@ package io.netty.channel.epoll; import io.netty.bootstrap.Bootstrap; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.EventLoopGroup; -import io.netty.channel.nio.NioEventLoopGroup; import io.netty.testsuite.transport.TestsuitePermutation; import io.netty.util.concurrent.DefaultThreadFactory; @@ -31,9 +30,9 @@ final class EpollTestUtils { private static final int WORKERS = 3; private static final EventLoopGroup epollBossGroup = - new NioEventLoopGroup(BOSSES, new DefaultThreadFactory("testsuite-epoll-boss", true)); + new EpollEventLoopGroup(BOSSES, new DefaultThreadFactory("testsuite-epoll-boss", true)); private static final EventLoopGroup epollWorkerGroup = - new NioEventLoopGroup(WORKERS, new DefaultThreadFactory("testsuite-epoll-worker", true)); + new EpollEventLoopGroup(WORKERS, new DefaultThreadFactory("testsuite-epoll-worker", true)); static List> newFactories() { return Collections.>singletonList(