diff --git a/transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerChannelImpl.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerChannelImpl.java index da3671c3f5..5b54e77922 100644 --- a/transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerChannelImpl.java +++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerChannelImpl.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.SocketAddress; -import java.nio.channels.Selector; import java.util.Collections; import java.util.HashSet; import java.util.Iterator; @@ -49,7 +48,6 @@ class SctpServerChannelImpl extends AbstractServerChannel final com.sun.nio.sctp.SctpServerChannel serverChannel; final Lock shutdownLock = new ReentrantLock(); - volatile Selector selector; private final SctpServerChannelConfig config; private volatile boolean bound; diff --git a/transport-sctp/src/main/java/io/netty/channel/sctp/SctpWorker.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpWorker.java index 83fb429529..c2454e9a3f 100644 --- a/transport-sctp/src/main/java/io/netty/channel/sctp/SctpWorker.java +++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpWorker.java @@ -45,7 +45,6 @@ import java.nio.channels.CancelledKeyException; import java.nio.channels.ClosedChannelException; import java.nio.channels.ClosedSelectorException; import java.nio.channels.SelectionKey; -import java.nio.channels.Selector; import java.util.Queue; import java.util.Set; import java.util.concurrent.Executor; @@ -430,7 +429,6 @@ public class SctpWorker extends NioWorker { try { if (channel.serverChannel.isOpen()) { channel.serverChannel.close(); - Selector selector = channel.selector; if (selector != null) { selector.wakeup(); } diff --git a/transport/src/main/java/io/netty/channel/socket/nio/AbstractNioWorker.java b/transport/src/main/java/io/netty/channel/socket/nio/AbstractNioWorker.java index 481f8823a1..fab9c72212 100644 --- a/transport/src/main/java/io/netty/channel/socket/nio/AbstractNioWorker.java +++ b/transport/src/main/java/io/netty/channel/socket/nio/AbstractNioWorker.java @@ -800,7 +800,6 @@ abstract class AbstractNioWorker implements Worker { try { if (channel.socket.isOpen()) { channel.socket.close(); - Selector selector = channel.selector; if (selector != null) { selector.wakeup(); } diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketChannel.java index 9ede4ef802..608537e90a 100644 --- a/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketChannel.java @@ -19,7 +19,6 @@ import static io.netty.channel.Channels.*; import java.io.IOException; import java.net.InetSocketAddress; -import java.nio.channels.Selector; import java.nio.channels.ServerSocketChannel; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; @@ -42,7 +41,6 @@ final class NioServerSocketChannel extends AbstractServerChannel final ServerSocketChannel socket; final Lock shutdownLock = new ReentrantLock(); - volatile Selector selector; final NioWorker worker; diff --git a/transport/src/main/java/io/netty/channel/socket/nio/SendBufferPool.java b/transport/src/main/java/io/netty/channel/socket/nio/SendBufferPool.java index c25db6aa1d..5a40272792 100644 --- a/transport/src/main/java/io/netty/channel/socket/nio/SendBufferPool.java +++ b/transport/src/main/java/io/netty/channel/socket/nio/SendBufferPool.java @@ -261,7 +261,7 @@ public class SendBufferPool { } } - final class FileSendBuffer implements SendBuffer { + static final class FileSendBuffer implements SendBuffer { private final FileRegion file; private long writtenBytes;