diff options
Diffstat (limited to 'dozentenmodul/src/main/java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/model/ContainerDefinition.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/model/ContainerDefinition.java b/dozentenmodul/src/main/java/org/openslx/dozmod/model/ContainerDefinition.java index 46dba2e0..92ec6607 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/model/ContainerDefinition.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/model/ContainerDefinition.java @@ -145,16 +145,22 @@ public class ContainerDefinition { } private String readContainerRecipe(File file) { - byte[] rawFile = null; + String recipe = null; try { + BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file)); - rawFile = new byte[(int) file.length()]; + byte[] rawFile = new byte[(int) file.length()]; bis.read(rawFile); + String rawRecipe = new String(rawFile, StandardCharsets.UTF_8); + + // replace windows by unix EOL + recipe = rawRecipe.replaceAll("\\r\\n", "\n"); + } catch (IOException e) { LOGGER.error("Could not read Container Recipe", e); } - return new String(rawFile, StandardCharsets.UTF_8); + return recipe; } /** |