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 HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)

Browse Source 
73690: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73594: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.3)
         73593: Merged V3.4-BUG-FIX (3.4.15) to V4.1-BUG-FIX (4.1.10)
            73526: MNT-11319: Merged DEV to V3.4-BUG-FIX (3.4.15).
               73508: MNT-11319 Accented Characters wrongly unzipped
                      - In Import dialog was added drop down list of encoding options. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74805 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-06-25 16:07:37 +00:00
parent b1bb208eb8
commit 88f2d1dc6f
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/java/org/alfresco/repo/action/executer/ImporterActionExecuter.java
View File

@@ -202,8 +202,19 @@ public class ImporterActionExecuter extends ActionExecuterAbstractBase
// NOTE: This encoding allows us to workaround bug:
// http://bugs.sun.com/bugdatabase/view_bug.do;:WuuT?bug_id=4820807
// We also try to use the extra encoding information if present
zipFile = new ZipFile(tempFile, isHighByteZip() ? "Cp437" : null, true);
String encoding = (String) ruleAction.getParameterValue(PARAM_ENCODING);
if (encoding == null)
{
encoding = "UTF-8";
}
else
{
if (encoding.equalsIgnoreCase("default"))
{
encoding = null;
}
}
zipFile = new ZipFile(tempFile, encoding, true);
// build a temp dir name based on the ID of the noderef we are importing
// also use the long life temp folder as large ZIP files can take a while
File alfTempDir = TempFileProvider.getLongLifeTempDir("import");