From 8a7d8a8ab7f577d836eaa28d4c89a3670fe3e6f4 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Thu, 24 Apr 2014 21:31:13 +0200 Subject: [PATCH] Remove unused method to match up 4.1 branch Motivation: 4 and 5 were diverged long time ago and we recently reverted some of the early commits in master. We must make sure 4.1 and master are not very different now. Modification: Remove ChannelHandlerInvokerUtil.invokeWriteAndFlush(...) as it is not used anyway and not exists in 4.1 Result: 4.1 and master got closer. --- .../java/io/netty/channel/ChannelHandlerInvokerUtil.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/transport/src/main/java/io/netty/channel/ChannelHandlerInvokerUtil.java b/transport/src/main/java/io/netty/channel/ChannelHandlerInvokerUtil.java index 9015bd787e..c820cd649e 100644 --- a/transport/src/main/java/io/netty/channel/ChannelHandlerInvokerUtil.java +++ b/transport/src/main/java/io/netty/channel/ChannelHandlerInvokerUtil.java @@ -168,11 +168,6 @@ public final class ChannelHandlerInvokerUtil { } } - public static void invokeWriteAndFlushNow(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) { - invokeWriteNow(ctx, msg, promise); - invokeFlushNow(ctx); - } - public static boolean validatePromise( ChannelHandlerContext ctx, ChannelPromise promise, boolean allowVoidPromise) { if (ctx == null) {