From 5ef153f4c1e5810c85410eb2637345eff03f358f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Br=C3=A9gier?= <fredbregier@free.fr>
Date: Wed, 2 May 2012 10:17:13 +0300
Subject: [PATCH] Fix same issue than branch master #290 for branch 3

---
 .../netty/handler/codec/http/AbstractDiskHttpData.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/jboss/netty/handler/codec/http/AbstractDiskHttpData.java b/src/main/java/org/jboss/netty/handler/codec/http/AbstractDiskHttpData.java
index 1cf8bd9f22..2a851139d0 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/AbstractDiskHttpData.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/AbstractDiskHttpData.java
@@ -115,9 +115,9 @@ public abstract class AbstractDiskHttpData extends AbstractHttpData {
         int written = 0;
         while (written < size) {
             written += localfileChannel.write(byteBuffer);
-            localfileChannel.force(false);
         }
         buffer.readerIndex(buffer.readerIndex() + written);
+        localfileChannel.force(false);
         localfileChannel.close();
         completed = true;
     }
@@ -141,7 +141,6 @@ public abstract class AbstractDiskHttpData extends AbstractHttpData {
             }
             while (written < localsize) {
                 written += fileChannel.write(byteBuffer);
-                fileChannel.force(false);
             }
             size += localsize;
             buffer.readerIndex(buffer.readerIndex() + written);
@@ -154,6 +153,7 @@ public abstract class AbstractDiskHttpData extends AbstractHttpData {
                 FileOutputStream outputStream = new FileOutputStream(file);
                 fileChannel = outputStream.getChannel();
             }
+            fileChannel.force(false);
             fileChannel.close();
             fileChannel = null;
             completed = true;
@@ -191,9 +191,10 @@ public abstract class AbstractDiskHttpData extends AbstractHttpData {
         while (read > 0) {
             byteBuffer.position(read).flip();
             written += localfileChannel.write(byteBuffer);
-            localfileChannel.force(false);
             read = inputStream.read(bytes);
         }
+        localfileChannel.force(false);
+        localfileChannel.close());
         size = written;
         if (definedSize > 0 && definedSize < size) {
             file.delete();
@@ -288,6 +289,8 @@ public abstract class AbstractDiskHttpData extends AbstractHttpData {
             FileChannel in = inputStream.getChannel();
             FileChannel out = outputStream.getChannel();
             long destsize = in.transferTo(0, size, out);
+            in.close();
+            out.close();
             if (destsize == size) {
                 file.delete();
                 file = dest;