From 55a6cc56ef802c4eb68ca577f71a77af94e36162 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 10 Jul 2013 23:41:37 +1000 Subject: [PATCH] Recycle messagelist when channel goes inactive (reverted from commit daa58ffe58dad14f486d7fca4d651eb7ed2303d1) --- proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java | 2 +- proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java | 1 - 2 files changed, 1 insertion(+), 2 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 index 74ac909e..ca1a78da 100644 --- a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java +++ b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java @@ -15,7 +15,7 @@ public class ChannelWrapper private final Channel ch; @Getter private volatile boolean closed; - final MessageList queue = MessageList.newInstance(); + private final MessageList queue = MessageList.newInstance(); private volatile boolean flushNow = true; public ChannelWrapper(ChannelHandlerContext ctx) 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 index f784ad5c..ede4ad5c 100644 --- a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java +++ b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java @@ -56,7 +56,6 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter ProxyServer.getInstance().getLogger().log( Level.INFO, "{0} has disconnected", handler ); } } - channel.queue.recycle(); } @Override