Commit fb4f0f10 authored by Kristof Szabados's avatar Kristof Szabados
Browse files

merged branches.


Signed-off-by: Kristof Szabados's avatarKristof Szabados <Kristof.Szabados@ericsson.com>
parent e646f1b8
......@@ -5481,12 +5481,10 @@ public final class AdditionalFunctions {
}
} else if (p_b64_b64Pos == '=') {
break;
} else if (p_b64_b64Pos == '\r' && p_b64[b64Pos + 1] == '\n') {
b64Pos++; // skip \n too
} else {
if (p_b64_b64Pos == '\r' && p_b64[b64Pos + 1] == '\n') {
b64Pos++; // skip \n too
} else {
throw new TtcnError(String.format("Error: Invalid character in Base64 encoded data: 0x%02X", p_b64_b64Pos));
}
throw new TtcnError(String.format("Error: Invalid character in Base64 encoded data: 0x%02X", p_b64_b64Pos));
}
b64Pos++;
......
Markdown is supported
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