Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3
Commits:
-
13be965b
by Tony CHEMIT at 2018-04-10T20:36:25Z
1 changed file:
Changes:
| ... | ... | @@ -39,6 +39,7 @@ import org.nuiton.util.ZipUtil; |
| 39 | 39 |
import java.io.File;
|
| 40 | 40 |
import java.io.IOException;
|
| 41 | 41 |
import java.io.InputStream;
|
| 42 |
+import java.nio.charset.StandardCharsets;
|
|
| 42 | 43 |
import java.util.Arrays;
|
| 43 | 44 |
import java.util.Collections;
|
| 44 | 45 |
import java.util.Enumeration;
|
| ... | ... | @@ -154,8 +155,8 @@ public class ConfigureImportDataAction extends AbstractConfigureAction<AnalyzeIn |
| 154 | 155 |
File targetDirectory = getTreatmentDirectory();
|
| 155 | 156 |
String filename = getSourceToLoadFileName();
|
| 156 | 157 |
if (ZipUtil.isZipFile(upload)) {
|
| 157 |
- // let's decompress input stream it
|
|
| 158 |
- ZipFile zipfile = new ZipFile(upload);
|
|
| 158 |
+ // let's decompress input stream it (always in iso 8869_1)
|
|
| 159 |
+ ZipFile zipfile = new ZipFile(upload, StandardCharsets.ISO_8859_1);
|
|
| 159 | 160 |
Enumeration<? extends ZipEntry> entries = zipfile.entries();
|
| 160 | 161 |
if (!entries.hasMoreElements()) {
|
| 161 | 162 |
String message = t("t3.error.required.one.entry.in.zip.to.upload");
|