inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
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
This commit is contained in:
Alan Davis
2015-03-31 23:12:47 +00:00
parent 3054ca3ebc
commit 3086f8d178
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestWriter.java
View File

@@ -74,12 +74,14 @@ public class XMLTransferManifestWriter implements TransferManifestWriter
final String PREFIX = ManifestModel.MANIFEST_PREFIX; final String PREFIX = ManifestModel.MANIFEST_PREFIX;
private OutputFormat format;
/** /**
* Start the transfer manifest * Start the transfer manifest
*/ */
public void startTransferManifest(Writer writer) throws SAXException public void startTransferManifest(Writer writer) throws SAXException
{ {
OutputFormat format = OutputFormat.createPrettyPrint(); format = OutputFormat.createPrettyPrint();
format.setNewLineAfterDeclaration(false); format.setNewLineAfterDeclaration(false);
format.setIndentSize(3); format.setIndentSize(3);
format.setEncoding("UTF-8"); format.setEncoding("UTF-8");
@@ -516,7 +518,17 @@ public class XMLTransferManifestWriter implements TransferManifestWriter
if (value != null) if (value != null)
{ {
String strValue = (String) DefaultTypeConverter.INSTANCE.convert(String.class, value); 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, writer.endElement(TransferModel.TRANSFER_MODEL_1_0_URI,
ManifestModel.LOCALNAME_ELEMENT_MLVALUE, PREFIX + ":" ManifestModel.LOCALNAME_ELEMENT_MLVALUE, PREFIX + ":"