From ed47feeed81819562bedb707fbd44e67e254d886 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Sun, 10 Jun 2012 20:45:38 +0200 Subject: [PATCH] Fix checkstyle --- .../src/main/java/io/netty/handler/stream/ChunkedFile.java | 5 ++--- .../main/java/io/netty/handler/stream/ChunkedInput.java | 3 +-- .../java/io/netty/handler/stream/ChunkedMessageInput.java | 1 - .../main/java/io/netty/handler/stream/ChunkedNioFile.java | 2 +- .../java/io/netty/handler/stream/ChunkedNioStream.java | 4 +--- .../main/java/io/netty/handler/stream/ChunkedStream.java | 4 ++-- .../java/io/netty/handler/stream/ChunkedWriteHandler.java | 7 ++----- 7 files changed, 9 insertions(+), 17 deletions(-) diff --git a/handler/src/main/java/io/netty/handler/stream/ChunkedFile.java b/handler/src/main/java/io/netty/handler/stream/ChunkedFile.java index 9f1e0d51ba..3d1b248e4e 100644 --- a/handler/src/main/java/io/netty/handler/stream/ChunkedFile.java +++ b/handler/src/main/java/io/netty/handler/stream/ChunkedFile.java @@ -143,14 +143,13 @@ public class ChunkedFile implements ChunkedByteInput { } int chunkSize = (int) Math.min(this.chunkSize, endOffset - offset); - // Check if the buffer is backed by an byte array. If so we can optimize it a bit an safe a copy - + byte[] chunk = new byte[chunkSize]; file.readFully(chunk); buffer.writeBytes(chunk); this.offset = offset + chunkSize; - + return true; } } diff --git a/handler/src/main/java/io/netty/handler/stream/ChunkedInput.java b/handler/src/main/java/io/netty/handler/stream/ChunkedInput.java index 767f8c43ec..591a6f74c9 100644 --- a/handler/src/main/java/io/netty/handler/stream/ChunkedInput.java +++ b/handler/src/main/java/io/netty/handler/stream/ChunkedInput.java @@ -32,8 +32,7 @@ public interface ChunkedInput { * Releases the resources associated with the stream. */ void close() throws Exception; - - + /** * Fetches a chunked data from the stream. The chunk is then * transfered to the given buffer. Once this method returns the last chunk diff --git a/handler/src/main/java/io/netty/handler/stream/ChunkedMessageInput.java b/handler/src/main/java/io/netty/handler/stream/ChunkedMessageInput.java index 0dad5b1159..e2342dbd7d 100644 --- a/handler/src/main/java/io/netty/handler/stream/ChunkedMessageInput.java +++ b/handler/src/main/java/io/netty/handler/stream/ChunkedMessageInput.java @@ -19,7 +19,6 @@ import java.util.Queue; /** * {@link ChunkedInput} which reads its chunks and transfer it to a {@link Queue} - * * */ public interface ChunkedMessageInput extends ChunkedInput> { diff --git a/handler/src/main/java/io/netty/handler/stream/ChunkedNioFile.java b/handler/src/main/java/io/netty/handler/stream/ChunkedNioFile.java index 9abc7447be..ff0fb9f1ee 100644 --- a/handler/src/main/java/io/netty/handler/stream/ChunkedNioFile.java +++ b/handler/src/main/java/io/netty/handler/stream/ChunkedNioFile.java @@ -164,7 +164,7 @@ public class ChunkedNioFile implements ChunkedByteInput { chunk.flip(); buffer.writeBytes(chunk); this.offset += readBytes; - + return true; } } diff --git a/handler/src/main/java/io/netty/handler/stream/ChunkedNioStream.java b/handler/src/main/java/io/netty/handler/stream/ChunkedNioStream.java index 82f2f580e3..75b39bd854 100644 --- a/handler/src/main/java/io/netty/handler/stream/ChunkedNioStream.java +++ b/handler/src/main/java/io/netty/handler/stream/ChunkedNioStream.java @@ -100,7 +100,6 @@ public class ChunkedNioStream implements ChunkedByteInput { if (isEndOfInput()) { return false; } - // buffer cannot be not be empty from there int readBytes = byteBuffer.position(); for (;;) { @@ -110,7 +109,6 @@ public class ChunkedNioStream implements ChunkedByteInput { } readBytes += localReadBytes; offset += localReadBytes; - if (readBytes == chunkSize) { break; } @@ -118,7 +116,7 @@ public class ChunkedNioStream implements ChunkedByteInput { byteBuffer.flip(); buffer.writeBytes(byteBuffer); byteBuffer.clear(); - + return true; } } diff --git a/handler/src/main/java/io/netty/handler/stream/ChunkedStream.java b/handler/src/main/java/io/netty/handler/stream/ChunkedStream.java index b3bfaa5b23..3db9ff301f 100644 --- a/handler/src/main/java/io/netty/handler/stream/ChunkedStream.java +++ b/handler/src/main/java/io/netty/handler/stream/ChunkedStream.java @@ -105,9 +105,9 @@ public class ChunkedStream implements ChunkedByteInput { } else { chunkSize = Math.min(this.chunkSize, in.available()); } - + // transfer to buffer - offset =+ buffer.writeBytes(in, chunkSize); + offset += buffer.writeBytes(in, chunkSize); return true; } } diff --git a/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java b/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java index f0f7ad37f7..83f4e2ad30 100644 --- a/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java +++ b/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java @@ -274,13 +274,10 @@ public class ChunkedWriteHandler return; } } - - } /** - * Read the next {@link ChunkedInput} and transfer it the the outbound buffer. - * + * Read the next {@link ChunkedInput} and transfer it the the outbound buffer. * @param ctx the {@link ChannelHandlerContext} this handler is bound to * @param chunks the {@link ChunkedInput} to read from * @return read true if something could be transfered to the outbound buffer @@ -295,7 +292,7 @@ public class ChunkedWriteHandler throw new IllegalArgumentException("ChunkedInput instance " + chunks + " not supported"); } } - + static void closeInput(ChunkedInput chunks) { try { chunks.close();