From ea61b5b5b368a3e2ea556bb92edc1bc6c4216d20 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Mon, 9 May 2016 10:34:36 +0200 Subject: [PATCH] [#5223] Remove indirection in DefaultChannelPipeline.executorSafe(...) Motivation: We use channel.unsafe().invoker().executor() in DefaultChannelPipeline.executorSafe(...) which is an unnecessary indirection to channel.eventLoop(). Modifications: Remove indirection by using channel.eventLoop(). Result: Cleaner code. --- .../src/main/java/io/netty/channel/DefaultChannelPipeline.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java b/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java index 5e56a97406..85696240a5 100644 --- a/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java +++ b/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java @@ -1286,7 +1286,7 @@ final class DefaultChannelPipeline implements ChannelPipeline { // We check for channel().isRegistered and handlerAdded because even if isRegistered() is false we // can safely access the invoker() if handlerAdded is true. This is because in this case the Channel // was previously registered and so we can still access the old EventLoop to dispatch things. - return channel.isRegistered() || registered ? channel.unsafe().invoker().executor() : null; + return channel.isRegistered() || registered ? channel.eventLoop() : null; } return invoker.executor(); }