From c667a546b441d92ea180f4fe8ace2fa3523b4212 Mon Sep 17 00:00:00 2001 From: Moritz Eysholdt Date: Fri, 29 Jul 2016 13:59:01 +0200 Subject: [PATCH] [MANIFEST.MF-cleanup] splitting lines should also work on UNIX newlines Signed-off-by: Moritz Eysholdt --- .../src/org/eclipse/xtext/util/MergeableManifest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/MergeableManifest.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/MergeableManifest.java index 0ed1ad3de..bc5376757 100644 --- a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/MergeableManifest.java +++ b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/MergeableManifest.java @@ -61,7 +61,7 @@ public class MergeableManifest extends Manifest { public static String make512Safe(StringBuffer lines) { if (lines.length() > 512) { StringBuilder result = new StringBuilder(lines.length()); - String[] splitted = lines.toString().split("\\r\\n"); + String[] splitted = lines.toString().split("\\r?\\n"); for(String string: splitted) { if (string.length() > 512) { int idx = 510;