From bb69af5cd0ff9bf599d62800e7d8e52fc31bd5a7 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 29 Jun 2014 09:22:34 +1000
Subject: [PATCH] Disable epoll whilst we try to replicate some issues

---
 proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index c1afcbd2a..57f98a459 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -80,7 +80,7 @@ public class PipelineUtils
 
     static
     {
-        if ( !PlatformDependent.isWindows() )
+        if ( !PlatformDependent.isWindows() && Boolean.parseBoolean( System.getProperty( "bungee.epoll", "false" ) ) )
         {
             ProxyServer.getInstance().getLogger().info( "Not on Windows, attempting to use enhanced EpollEventLoop" );
             EpollEventLoopGroup testGroup = null;
@@ -116,7 +116,7 @@ public class PipelineUtils
     {
         return epoll ? EpollSocketChannel.class : NioSocketChannel.class;
     }
-    
+
     public static Class<? extends Channel> getDatagramChannel()
     {
         return epoll ? EpollDatagramChannel.class : NioDatagramChannel.class;