Merge pull request #126 from SpigotMC/master

SpigotMC#2055: Mark inactive channels as closed
HexagonMC · Feb 7, 2017 · 712982f · 712982f
2 parents 33cb9e3 + 01f4448
commit 712982f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
@@ -57,6 +57,11 @@ public void write(Object packet)
         }
     }
 
+    public void markClosed()
+    {
+        closed = closing = true;
+    }
+
     public void close()
     {
         close( null );

diff --git a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
@@ -52,6 +52,7 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception
     {
         if ( handler != null )
         {
+            channel.markClosed();
             handler.disconnected( channel );
 
             if ( !( handler instanceof InitialHandler || handler instanceof PingHandler ) )