From 4c4cdd51a1b2b2f8675bc19389fd66291672d992 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 2 Aug 2013 07:30:30 +1000 Subject: [PATCH] Downgrade to Netty CR9 --- pom.xml | 2 +- .../src/main/java/net/md_5/bungee/BungeeCord.java | 6 +++--- .../java/net/md_5/bungee/http/HttpClient.java | 2 +- .../java/net/md_5/bungee/http/HttpHandler.java | 2 +- .../net/md_5/bungee/netty/ChannelWrapper.java | 4 +--- .../java/net/md_5/bungee/netty/CipherDecoder.java | 4 ++-- .../java/net/md_5/bungee/netty/HandlerBoss.java | 15 +++------------ .../java/net/md_5/bungee/netty/PacketDecoder.java | 4 ++-- 8 files changed, 14 insertions(+), 25 deletions(-) diff --git a/pom.xml b/pom.xml index 51f980db..c902877c 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ unknown - 4.0.4.Final + 4.0.0.CR9 UTF-8 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java index c175f9e4..02bb0a1d 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java @@ -167,14 +167,14 @@ public class BungeeCord extends ProxyServer public static void main(String[] args) throws Exception { Calendar deadline = Calendar.getInstance(); - deadline.set( 2013, 8, 12 ); // year, month, date + deadline.set( 2013, 8, 4 ); // year, month, date if ( Calendar.getInstance().after( deadline ) ) { System.err.println( "*** Warning, this build is outdated ***" ); System.err.println( "*** Please download a new build from http://ci.md-5.net/job/BungeeCord ***" ); System.err.println( "*** You will get NO support regarding this build ***" ); - System.err.println( "*** Server will start in 15 seconds ***" ); - Thread.sleep( TimeUnit.SECONDS.toMillis( 15 ) ); + System.err.println( "*** Server will start in 30 seconds ***" ); + Thread.sleep( TimeUnit.SECONDS.toMillis( 30 ) ); } BungeeCord bungee = new BungeeCord(); diff --git a/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java b/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java index 740e6716..c4ffc539 100644 --- a/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java +++ b/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java @@ -63,7 +63,7 @@ public class HttpClient HttpRequest request = new DefaultHttpRequest( HttpVersion.HTTP_1_1, HttpMethod.GET, path ); request.headers().set( HttpHeaders.Names.HOST, uri.getHost() ); - future.channel().writeAndFlush( request ); + future.channel().write( request ); } else { callback.done( null, future.cause() ); diff --git a/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java b/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java index fd486e04..c7e4dcfc 100644 --- a/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java @@ -31,7 +31,7 @@ public class HttpHandler extends SimpleChannelInboundHandler } @Override - protected void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws Exception + protected void messageReceived(ChannelHandlerContext ctx, HttpObject msg) throws Exception { if ( msg instanceof HttpResponse ) { 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 e48aa874..81db19b7 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 @@ -22,7 +22,7 @@ public class ChannelWrapper { if ( !closed ) { - ch.writeAndFlush( packet ); + ch.write( packet ); } } @@ -31,7 +31,6 @@ public class ChannelWrapper if ( !closed ) { closed = true; - ch.flush(); ch.close(); } } @@ -39,7 +38,6 @@ public class ChannelWrapper public void addBefore(String baseName, String name, ChannelHandler handler) { Preconditions.checkState( ch.eventLoop().inEventLoop(), "cannot add handler outside of event loop" ); - ch.pipeline().flush(); ch.pipeline().addBefore( baseName, name, handler ); } diff --git a/proxy/src/main/java/net/md_5/bungee/netty/CipherDecoder.java b/proxy/src/main/java/net/md_5/bungee/netty/CipherDecoder.java index e6fe7df9..91fba349 100644 --- a/proxy/src/main/java/net/md_5/bungee/netty/CipherDecoder.java +++ b/proxy/src/main/java/net/md_5/bungee/netty/CipherDecoder.java @@ -2,8 +2,8 @@ package net.md_5.bungee.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.MessageList; import io.netty.handler.codec.MessageToMessageDecoder; -import java.util.List; import javax.crypto.Cipher; public class CipherDecoder extends MessageToMessageDecoder @@ -17,7 +17,7 @@ public class CipherDecoder extends MessageToMessageDecoder } @Override - protected void decode(ChannelHandlerContext ctx, ByteBuf msg, List out) throws Exception + protected void decode(ChannelHandlerContext ctx, ByteBuf msg, MessageList out) throws Exception { out.add( cipher.cipher( ctx, msg ) ); } 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 f54763a6..67389b4c 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 @@ -3,10 +3,9 @@ package net.md_5.bungee.netty; import com.google.common.base.Preconditions; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; +import io.netty.channel.MessageList; import io.netty.handler.timeout.ReadTimeoutException; import java.io.IOException; -import java.util.ArrayDeque; -import java.util.Queue; import java.util.logging.Level; import net.md_5.bungee.BungeeCord; import net.md_5.bungee.api.ProxyServer; @@ -24,7 +23,6 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter private ChannelWrapper channel; private PacketHandler handler; - private final Queue msgs = new ArrayDeque<>(); public void setHandler(PacketHandler handler) { @@ -68,17 +66,10 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter } @Override - public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception + public void messageReceived(ChannelHandlerContext ctx, MessageList msgs) throws Exception { - msgs.add( msg ); - } - - @Override - public void channelReadComplete(ChannelHandlerContext ctx) throws Exception - { - while ( !msgs.isEmpty() ) + for ( Object msg : msgs ) { - Object msg = msgs.remove(); if ( handler != null ) { if ( msg instanceof PacketWrapper ) diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PacketDecoder.java b/proxy/src/main/java/net/md_5/bungee/netty/PacketDecoder.java index 670a7089..6c4ef785 100644 --- a/proxy/src/main/java/net/md_5/bungee/netty/PacketDecoder.java +++ b/proxy/src/main/java/net/md_5/bungee/netty/PacketDecoder.java @@ -2,8 +2,8 @@ package net.md_5.bungee.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.MessageList; import io.netty.handler.codec.ReplayingDecoder; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; @@ -28,7 +28,7 @@ public class PacketDecoder extends ReplayingDecoder private Protocol protocol; @Override - protected void decode(ChannelHandlerContext ctx, ByteBuf in, List out) throws Exception + protected void decode(ChannelHandlerContext ctx, ByteBuf in, MessageList out) throws Exception { // While we have enough data while ( true )