File part is missing from transferred bytes sum, close AsyncHttpClient#1126

Author: slandelle

src/main/java/com/ning/http/client/multipart/FilePart.java

@@ -108,21 +108,21 @@ public long write(WritableByteChannel target, byte[] boundary) throws IOExceptio
         RandomAccessFile raf = new RandomAccessFile(file, "r");
         FileChannel fc = raf.getChannel();
 
-        long l = file.length();
-        int fileLength = 0;
-        long nWrite = 0;
+        long actualFileLength = file.length();
+        long transferredFileBytes = 0;
         // FIXME why sync?
         try {
             synchronized (fc) {
-                while (fileLength != l) {
+                while (transferredFileBytes != actualFileLength) {
+                    long written = 0;
+                    
                     if (handler.isFailed()) {
                         LOGGER.debug("Stalled error");
                         throw new FileUploadStalledException();
                     }
                     try {
-                        nWrite = fc.transferTo(fileLength, l, target);
-
-                        if (nWrite == 0) {
+                        written = fc.transferTo(transferredFileBytes, actualFileLength, target);
+                        if (written == 0) {
                             LOGGER.info("Waiting for writing...");
                             try {
                                 fc.wait(50);
@@ -148,14 +148,15 @@ public long write(WritableByteChannel target, byte[] boundary) throws IOExceptio
                             throw ex;
                         }
                     }
-                    fileLength += nWrite;
+                    transferredFileBytes += written;
                 }
             }
         } finally {
             handler.completed();
             raf.close();
         }
 
+        length += transferredFileBytes;
         length += MultipartUtils.writeBytesToChannel(target, generateFileEnd());
 
         return length;

src/main/java/com/ning/http/client/multipart/MultipartBody.java

@@ -77,7 +77,7 @@ public byte[] getBoundary() {
     public long transferTo(long position, WritableByteChannel target) throws IOException {
 
         if (transfertDone) {
-            return -1;
+            throw new UnsupportedOperationException("Transfer is already done");
         }
 
         long overallLength = 0;