diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/HttpResponseEncoderTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/HttpResponseEncoderTest.java index 923ea36d50..2df55a0b95 100644 --- a/codec-http/src/test/java/io/netty/handler/codec/http/HttpResponseEncoderTest.java +++ b/codec-http/src/test/java/io/netty/handler/codec/http/HttpResponseEncoderTest.java @@ -76,6 +76,11 @@ public class HttpResponseEncoderTest { return 0; } + @Override + public long transferred() { + return 0; + } + @Override public long count() { return INTEGER_OVERLFLOW; diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollStreamChannel.java b/transport-native-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollStreamChannel.java index 653b4777eb..ca5c9d694e 100644 --- a/transport-native-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollStreamChannel.java +++ b/transport-native-epoll/src/main/java/io/netty/channel/epoll/AbstractEpollStreamChannel.java @@ -364,7 +364,7 @@ public abstract class AbstractEpollStreamChannel extends AbstractEpollChannel im private boolean writeFileRegion( ChannelOutboundBuffer in, DefaultFileRegion region, int writeSpinCount) throws Exception { final long regionCount = region.count(); - if (region.transfered() >= regionCount) { + if (region.transferred() >= regionCount) { in.remove(); return true; } @@ -374,7 +374,7 @@ public abstract class AbstractEpollStreamChannel extends AbstractEpollChannel im long flushedAmount = 0; for (int i = writeSpinCount - 1; i >= 0; i--) { - final long offset = region.transfered(); + final long offset = region.transferred(); final long localFlushedAmount = Native.sendfile(fd().intValue(), region, baseOffset, offset, regionCount - offset); if (localFlushedAmount == 0) { diff --git a/transport/src/main/java/io/netty/channel/DefaultFileRegion.java b/transport/src/main/java/io/netty/channel/DefaultFileRegion.java index d9a40c3369..4607b0e74d 100644 --- a/transport/src/main/java/io/netty/channel/DefaultFileRegion.java +++ b/transport/src/main/java/io/netty/channel/DefaultFileRegion.java @@ -114,11 +114,17 @@ public class DefaultFileRegion extends AbstractReferenceCounted implements FileR return count; } + @Deprecated @Override public long transfered() { return transfered; } + @Override + public long transferred() { + return transfered; + } + @Override public long transferTo(WritableByteChannel target, long position) throws IOException { long count = this.count - position; diff --git a/transport/src/main/java/io/netty/channel/FileRegion.java b/transport/src/main/java/io/netty/channel/FileRegion.java index 77c467c213..6a21e0941c 100644 --- a/transport/src/main/java/io/netty/channel/FileRegion.java +++ b/transport/src/main/java/io/netty/channel/FileRegion.java @@ -60,10 +60,18 @@ public interface FileRegion extends ReferenceCounted { long position(); /** - * Return the bytes which was transfered already + * Returns the bytes which was transfered already. + * + * @deprecated Use {@link #transferred()} instead. */ + @Deprecated long transfered(); + /** + * Returns the bytes which was transfered already. + */ + long transferred(); + /** * Returns the number of bytes to transfer. */ diff --git a/transport/src/main/java/io/netty/channel/nio/AbstractNioByteChannel.java b/transport/src/main/java/io/netty/channel/nio/AbstractNioByteChannel.java index 1fae623c17..7632ac513f 100644 --- a/transport/src/main/java/io/netty/channel/nio/AbstractNioByteChannel.java +++ b/transport/src/main/java/io/netty/channel/nio/AbstractNioByteChannel.java @@ -201,7 +201,7 @@ public abstract class AbstractNioByteChannel extends AbstractNioChannel { } } else if (msg instanceof FileRegion) { FileRegion region = (FileRegion) msg; - boolean done = region.transfered() >= region.count(); + boolean done = region.transferred() >= region.count(); if (!done) { long flushedAmount = 0; @@ -217,7 +217,7 @@ public abstract class AbstractNioByteChannel extends AbstractNioChannel { } flushedAmount += localFlushedAmount; - if (region.transfered() >= region.count()) { + if (region.transferred() >= region.count()) { done = true; break; } diff --git a/transport/src/main/java/io/netty/channel/oio/AbstractOioByteChannel.java b/transport/src/main/java/io/netty/channel/oio/AbstractOioByteChannel.java index a5c438337f..129a6b69a1 100644 --- a/transport/src/main/java/io/netty/channel/oio/AbstractOioByteChannel.java +++ b/transport/src/main/java/io/netty/channel/oio/AbstractOioByteChannel.java @@ -208,9 +208,9 @@ public abstract class AbstractOioByteChannel extends AbstractOioChannel { in.remove(); } else if (msg instanceof FileRegion) { FileRegion region = (FileRegion) msg; - long transfered = region.transfered(); + long transferred = region.transferred(); doWriteFileRegion(region); - in.progress(region.transfered() - transfered); + in.progress(region.transferred() - transferred); in.remove(); } else { in.remove(new UnsupportedOperationException( diff --git a/transport/src/main/java/io/netty/channel/oio/OioByteStreamChannel.java b/transport/src/main/java/io/netty/channel/oio/OioByteStreamChannel.java index 758acb236d..6d8863b9d3 100644 --- a/transport/src/main/java/io/netty/channel/oio/OioByteStreamChannel.java +++ b/transport/src/main/java/io/netty/channel/oio/OioByteStreamChannel.java @@ -144,9 +144,9 @@ public abstract class OioByteStreamChannel extends AbstractOioByteChannel { } private static void checkEOF(FileRegion region) throws IOException { - if (region.transfered() < region.count()) { + if (region.transferred() < region.count()) { throw new EOFException("Expected to be able to write " + region.count() + " bytes, " + - "but only wrote " + region.transfered()); + "but only wrote " + region.transferred()); } } diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java index 5b030a00fa..48ab64503f 100644 --- a/transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java @@ -253,7 +253,7 @@ public class NioSocketChannel extends AbstractNioByteChannel implements io.netty @Override protected long doWriteFileRegion(FileRegion region) throws Exception { - final long position = region.transfered(); + final long position = region.transferred(); return region.transferTo(javaChannel(), position); }