diff --git a/transport/src/main/java/io/netty/channel/AbstractChannel.java b/transport/src/main/java/io/netty/channel/AbstractChannel.java index eeda3cb99b..5876fc3b1a 100644 --- a/transport/src/main/java/io/netty/channel/AbstractChannel.java +++ b/transport/src/main/java/io/netty/channel/AbstractChannel.java @@ -791,7 +791,7 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha } } - final class CloseFuture extends DefaultChannelPromise { + static final class CloseFuture extends DefaultChannelPromise { CloseFuture(AbstractChannel ch) { super(ch); diff --git a/transport/src/main/java/io/netty/channel/ChannelOutboundBuffer.java b/transport/src/main/java/io/netty/channel/ChannelOutboundBuffer.java index 8d1bbf6208..568d0068c4 100644 --- a/transport/src/main/java/io/netty/channel/ChannelOutboundBuffer.java +++ b/transport/src/main/java/io/netty/channel/ChannelOutboundBuffer.java @@ -245,7 +245,7 @@ public final class ChannelOutboundBuffer { return false; } - Entry e = buffer[this.flushed]; + Entry e = buffer[flushed]; Object msg = e.msg; if (msg == null) { return false; @@ -256,7 +256,7 @@ public final class ChannelOutboundBuffer { e.clear(); - this.flushed = flushed + 1 & buffer.length - 1; + flushed = flushed + 1 & buffer.length - 1; safeRelease(msg); diff --git a/transport/src/main/java/io/netty/channel/embedded/EmbeddedChannel.java b/transport/src/main/java/io/netty/channel/embedded/EmbeddedChannel.java index 2da3966bf4..5b01a9c58d 100644 --- a/transport/src/main/java/io/netty/channel/embedded/EmbeddedChannel.java +++ b/transport/src/main/java/io/netty/channel/embedded/EmbeddedChannel.java @@ -197,7 +197,8 @@ public class EmbeddedChannel extends AbstractChannel { flush(); - for (int i = 0; i < futures.size(); i++) { + int size = futures.size(); + for (int i = 0; i < size; i++) { ChannelFuture future = (ChannelFuture) futures.get(i); assert future.isDone(); if (future.cause() != null) { diff --git a/transport/src/main/java/io/netty/channel/local/LocalChannel.java b/transport/src/main/java/io/netty/channel/local/LocalChannel.java index 6b067d476c..a52937ad38 100644 --- a/transport/src/main/java/io/netty/channel/local/LocalChannel.java +++ b/transport/src/main/java/io/netty/channel/local/LocalChannel.java @@ -293,8 +293,8 @@ public class LocalChannel extends AbstractChannel { peerLoop.execute(new Runnable() { @Override public void run() { - for (Object o: msgsCopy) { - peer.inboundBuffer.add(o); + for (int i = 0; i < msgsCopy.length; i++) { + peer.inboundBuffer.add(msgsCopy[i]); } finishPeerRead(peer, peerPipeline); } diff --git a/transport/src/main/java/io/netty/channel/nio/AbstractNioMessageChannel.java b/transport/src/main/java/io/netty/channel/nio/AbstractNioMessageChannel.java index 6c0e1c8333..70c6d97cea 100644 --- a/transport/src/main/java/io/netty/channel/nio/AbstractNioMessageChannel.java +++ b/transport/src/main/java/io/netty/channel/nio/AbstractNioMessageChannel.java @@ -85,7 +85,8 @@ public abstract class AbstractNioMessageChannel extends AbstractNioChannel { exception = t; } - for (int i = 0; i < readBuf.size(); i ++) { + int size = readBuf.size(); + for (int i = 0; i < size; i ++) { pipeline.fireChannelRead(readBuf.get(i)); } readBuf.clear(); diff --git a/transport/src/main/java/io/netty/channel/nio/NioEventLoop.java b/transport/src/main/java/io/netty/channel/nio/NioEventLoop.java index dfb76dd1f6..bff26f4514 100644 --- a/transport/src/main/java/io/netty/channel/nio/NioEventLoop.java +++ b/transport/src/main/java/io/netty/channel/nio/NioEventLoop.java @@ -472,9 +472,8 @@ public final class NioEventLoop extends SingleThreadEventLoop { return; } - int readyOps = -1; try { - readyOps = k.readyOps(); + int readyOps = k.readyOps(); if ((readyOps & (SelectionKey.OP_READ | SelectionKey.OP_ACCEPT)) != 0 || readyOps == 0) { unsafe.read(); if (!ch.isOpen()) { diff --git a/transport/src/main/java/io/netty/channel/oio/AbstractOioMessageChannel.java b/transport/src/main/java/io/netty/channel/oio/AbstractOioMessageChannel.java index 9e1337d187..7fcd1045f5 100644 --- a/transport/src/main/java/io/netty/channel/oio/AbstractOioMessageChannel.java +++ b/transport/src/main/java/io/netty/channel/oio/AbstractOioMessageChannel.java @@ -47,7 +47,8 @@ public abstract class AbstractOioMessageChannel extends AbstractOioChannel { exception = t; } - for (int i = 0; i < readBuf.size(); i ++) { + int size = readBuf.size(); + for (int i = 0; i < size; i ++) { pipeline.fireChannelRead(readBuf.get(i)); } readBuf.clear();