From 975bac709a2db95f30f86c230b2a4fa5b83197b3 Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Tue, 14 Sep 2010 15:23:47 +0000
Subject: [PATCH] ALF-4738 - preserve linefeed on transfer of destination
 transfer report.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22517 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../transfer/HttpClientTransmitterImpl.java   | 54 +++++++++++++++----
 1 file changed, 43 insertions(+), 11 deletions(-)

diff --git a/source/java/org/alfresco/repo/transfer/HttpClientTransmitterImpl.java b/source/java/org/alfresco/repo/transfer/HttpClientTransmitterImpl.java
index 6f62ca8a26..a410dafbec 100644
--- a/source/java/org/alfresco/repo/transfer/HttpClientTransmitterImpl.java
+++ b/source/java/org/alfresco/repo/transfer/HttpClientTransmitterImpl.java
@@ -22,10 +22,15 @@ package org.alfresco.repo.transfer;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
+import java.nio.ByteBuffer;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
@@ -602,20 +607,22 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
                 int responseStatus = httpClient.executeMethod(hostConfig, getReportRequest, httpState);
                 checkResponseStatus("getReport", responseStatus, getReportRequest);
                 
-               
                 InputStream is = getReportRequest.getResponseBodyAsStream();
-                InputStreamReader reader = new InputStreamReader(is);
                 
-                BufferedReader br = new BufferedReader(reader);                
-                BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(result));
-
-                String s = br.readLine();
-                while(s != null)
+                // Now copy the response input stream to result.
+                final ReadableByteChannel inputChannel = Channels.newChannel(is);
+                final WritableByteChannel outputChannel = Channels.newChannel(result);
+                try
                 {
-                    bw.write(s);
-                    s = br.readLine();
+                    // copy the channels
+                    channelCopy(inputChannel, outputChannel);
+                }
+                finally
+                {
+                    // closing the channels
+                    inputChannel.close();
+                    outputChannel.close();
                 }
-                bw.close();
                            
                 return;
             } 
@@ -627,7 +634,7 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
             {
                 String error = "Failed to execute HTTP request to target";
                 log.debug(error, e);
-                throw new TransferException(MSG_HTTP_REQUEST_FAILED, new Object[]{"sendManifest", target.toString(), e.toString()}, e);
+                throw new TransferException(MSG_HTTP_REQUEST_FAILED, new Object[]{"getTransferReport", target.toString(), e.toString()}, e);
             }
         } 
         finally
@@ -635,6 +642,31 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
             getReportRequest.releaseConnection();
         }        
     }
+    
+    private static void channelCopy(final ReadableByteChannel src, final WritableByteChannel dest) throws IOException 
+    {
+        final ByteBuffer buffer = ByteBuffer.allocateDirect(2 * 1024);
+        while (src.read(buffer) != -1) 
+        {
+            // prepare the buffer to be drained
+            buffer.flip();
+            // write to the channel, may block
+             dest.write(buffer);
+        
+            // If partial transfer, shift remainder down
+            // If buffer is empty, same as doing clear()
+            buffer.compact();
+        }
+        
+        // EOF will leave buffer in fill state
+        buffer.flip();
+        
+        // make sure the buffer is fully drained.
+        while (buffer.hasRemaining()) 
+        {
+            dest.write(buffer);
+        }
+    }
 
     protected PostMethod getPostMethod()
     {