Commit 0d6205af authored by Karsten Loesing's avatar Karsten Loesing
Browse files

Also accept \r\n as newline in Torperf results files.

parent 9657de4a
......@@ -3,6 +3,7 @@
* Medium changes
- Include the hostname in directory source entries of consensuses
and votes.
- Also accept \r\n as newline in Torperf results files.
# Changes in version 1.1.0 - 2015-12-28
......
......@@ -26,7 +26,7 @@ public class TorperfResultImpl extends DescriptorImpl
}
List<Descriptor> parsedDescriptors = new ArrayList<>();
String descriptorString = new String(rawDescriptorBytes);
Scanner s = new Scanner(descriptorString).useDelimiter("\n");
Scanner s = new Scanner(descriptorString).useDelimiter("\r?\n");
String typeAnnotation = "";
while (s.hasNext()) {
String line = s.next();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment