diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java index 259d5f6501..7fc5036ea7 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Serializable; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -421,7 +422,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, * there's no more data to read. Each line will appended to a StringBuilder * and returned as String. */ - BufferedReader reader = new BufferedReader(new InputStreamReader(is)); + BufferedReader reader = new BufferedReader(new InputStreamReader(is, Charset.forName("UTF-8"))); StringBuilder sb = new StringBuilder(); String line = null; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportGet.java index 5b5195b7e3..faa1bc5366 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportGet.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportGet.java @@ -19,9 +19,11 @@ package org.alfresco.module.org_alfresco_module_rm.script; import java.io.File; -import java.io.FileWriter; +import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStreamWriter; import java.io.Writer; +import java.nio.charset.Charset; import java.util.Date; import java.util.List; @@ -128,7 +130,7 @@ public class TransferReportGet extends BaseTransferWebScript } // create the writer - writer = new FileWriter(report); + writer = new OutputStreamWriter(new FileOutputStream(report), Charset.forName("UTF-8")); // use RMService to get disposition authority String dispositionAuthority = null; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java index 3e7bc3f559..f8106d698f 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java @@ -19,10 +19,12 @@ package org.alfresco.module.org_alfresco_module_rm.script; import java.io.File; -import java.io.FileWriter; +import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStreamWriter; import java.io.Serializable; import java.io.Writer; +import java.nio.charset.Charset; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -236,7 +238,7 @@ public class TransferReportPost extends BaseTransferWebScript } // create the writer - writer = new FileWriter(report); + writer = new OutputStreamWriter(new FileOutputStream(report), Charset.forName("UTF-8")); // use RMService to get disposition authority String dispositionAuthority = null;