PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Update to Netty 4.0.4-Final

Browse Source
This commit is contained in:
md_5 2013-07-24 15:58:02 +10:00
parent fa0ee02beb
commit 09e592295f
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -59,7 +59,7 @@
<properties> <properties>
<build.number>unknown</build.number> <build.number>unknown</build.number>
<netty.version>4.0.4.Final-SNAPSHOT</netty.version> <netty.version>4.0.4.Final</netty.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>

5
proxy/src/main/java/net/md_5/bungee/BungeeCord.java
View File

@ -209,11 +209,6 @@ public class BungeeCord extends ProxyServer
@Override @Override
public void start() throws Exception public void start() throws Exception
{ {
if ( System.getProperty( "io.netty.noResourceLeakDetection" ) != null )
{
System.setProperty( "io.netty.noResourceLeakDetection", "true" );
}
pluginsFolder.mkdir(); pluginsFolder.mkdir();
pluginManager.detectPlugins( pluginsFolder ); pluginManager.detectPlugins( pluginsFolder );
config.load(); config.load();

7
proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
View File

@ -63,10 +63,7 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
@Override @Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
{ {
if ( ctx.channel().isActive() ) msgs.add( msg );
{
msgs.add( msg );
}
} }
@Override @Override
@ -76,7 +73,7 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
while ( !msgs.isEmpty() ) while ( !msgs.isEmpty() )
{ {
Object msg = msgs.remove(); Object msg = msgs.remove();
if ( handler != null && ctx.channel().isActive() ) if ( handler != null )
{ {
if ( msg instanceof PacketWrapper ) if ( msg instanceof PacketWrapper )
{ {