From 229f83a7e615f89cf21fd3b64b6f259d1edf8dcc Mon Sep 17 00:00:00 2001 From: Jakob Buchgraber Date: Mon, 10 Nov 2014 19:35:13 +0100 Subject: [PATCH] Correctly shutdown wrapped Executor in PausableChannelEventExecutor.shutdown() Motivation: PausableChannelEventExecutor().shutdown() used to call unwrap().terminationFuture() instead of unwrap.shutdown(). This error was reported by @xfrag in a comment to a commit message [1]. Tyvm. Modifications: PausableChannelEventExecutor.shutdown() now correctly invokes unwrap().shutdown() instead of unwrap().terminationFuture(). Result: Correct code. [1] https://github.com/netty/netty/commit/220660e351b2a22112b19c4af45e403eab1f73ab#commitcomment-8489643 --- .../java/io/netty/channel/PausableChannelEventExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport/src/main/java/io/netty/channel/PausableChannelEventExecutor.java b/transport/src/main/java/io/netty/channel/PausableChannelEventExecutor.java index 48c4e5efda..e4f478ad9f 100644 --- a/transport/src/main/java/io/netty/channel/PausableChannelEventExecutor.java +++ b/transport/src/main/java/io/netty/channel/PausableChannelEventExecutor.java @@ -200,7 +200,7 @@ abstract class PausableChannelEventExecutor implements PausableEventExecutor, Ch @Override @Deprecated public void shutdown() { - unwrap().terminationFuture(); + unwrap().shutdown(); } @Override