From 9b2fede68edd9b12e3abc8421c6c484339d75042 Mon Sep 17 00:00:00 2001 From: Frederic Bregier Date: Sun, 7 Dec 2014 13:19:20 +0100 Subject: [PATCH] Fix AbstractDiskHttpData int conversion from long Motivations: The chunkSize might be oversized after comparison (size being > of int capacity) if file size is bigger than an integer. Modifications: Change it to long. Result: There is no more int oversized. Same fix for 4.1 and Master --- .../handler/codec/http/multipart/AbstractDiskHttpData.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractDiskHttpData.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractDiskHttpData.java index 9130d33f4d..f320927e25 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractDiskHttpData.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractDiskHttpData.java @@ -341,11 +341,11 @@ public abstract class AbstractDiskHttpData extends AbstractHttpData { FileOutputStream outputStream = new FileOutputStream(dest); FileChannel in = inputStream.getChannel(); FileChannel out = outputStream.getChannel(); - int chunkSize = 8196; + long chunkSize = 8196; long position = 0; while (position < size) { if (chunkSize < size - position) { - chunkSize = (int) (size - position); + chunkSize = size - position; } position += in.transferTo(position, chunkSize , out); }