From 3086f8d1786d566fbcdc04105d1409afa39b6ac3 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Tue, 31 Mar 2015 23:12:47 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)   
 100843: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)     
  100754: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)          99876: Merged
 V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)             99778: Merged DEV
 to V4.1-BUG-FIX (4.1.10)                81615 : MNT-12101: Workflow loses the
 line feed in the description                   - Ignoring of trim for
 MLValues                81620 : MNT-12101: Workflow loses the line feed in
 the description                   - Added a property to show value with line
 breaks

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../manifest/XMLTransferManifestWriter.java      | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestWriter.java b/source/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestWriter.java
index abe56dbe60..687ffb4719 100644
--- a/source/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestWriter.java
+++ b/source/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestWriter.java
@@ -74,12 +74,14 @@ public class XMLTransferManifestWriter implements TransferManifestWriter
 
     final String PREFIX = ManifestModel.MANIFEST_PREFIX;
 
+    private OutputFormat format;
+
     /**
      * Start the transfer manifest
      */
     public void startTransferManifest(Writer writer) throws SAXException
     {
-        OutputFormat format = OutputFormat.createPrettyPrint();
+        format = OutputFormat.createPrettyPrint();
         format.setNewLineAfterDeclaration(false);
         format.setIndentSize(3);
         format.setEncoding("UTF-8");
@@ -516,7 +518,17 @@ public class XMLTransferManifestWriter implements TransferManifestWriter
         if (value != null)
         {
             String strValue = (String) DefaultTypeConverter.INSTANCE.convert(String.class, value);
-            writer.characters(strValue.toCharArray(), 0, strValue.length());
+            
+            boolean oldValue = format.isTrimText();
+            format.setTrimText(false);
+            try
+            {
+               writer.characters(strValue.toCharArray(), 0, strValue.length());
+            }
+            finally
+            {
+               format.setTrimText(oldValue);
+            }
         }
         writer.endElement(TransferModel.TRANSFER_MODEL_1_0_URI,
                     ManifestModel.LOCALNAME_ELEMENT_MLVALUE, PREFIX + ":"