inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged /BRANCHES/V3.4 to HEAD:

Browse Source 
23464: Reinstate transfer test of greek paths.
      - Manifest was being written by FileWriter() which would use default character set.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23662 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Brian Remmington
2010-11-16 08:00:52 +00:00
parent 3d8c239fb7
commit 3419d5b067
4 changed files with 222 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/repo/transfer/TransferServiceImpl2.java
View File

@@ -19,13 +19,16 @@
package org.alfresco.repo.transfer;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Serializable;
import java.io.Writer;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Collection;
@@ -915,7 +918,7 @@ public class TransferServiceImpl2 implements TransferService2
// where to put snapshot ?
File tempDir = TempFileProvider.getLongLifeTempDir(FILE_DIRECTORY);
File snapshotFile = TempFileProvider.createTempFile("TRX-SNAP", FILE_SUFFIX, tempDir);
FileWriter snapshotWriter = new FileWriter(snapshotFile);
Writer snapshotWriter = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(snapshotFile), "UTF-8"));
// Write the manifest file
TransferManifestWriter formatter = new XMLTransferManifestWriter();
@@ -1289,7 +1292,7 @@ public class TransferServiceImpl2 implements TransferService2
*/
private static void outputFile(File file) throws IOException
{
BufferedReader reader = new BufferedReader(new FileReader(file));
BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF-8"));
String s = reader.readLine();
while(s != null)
{