From 4f0b3208a8e4692fad77ce63509730982365c2da Mon Sep 17 00:00:00 2001 From: Francois Date: Mon, 9 May 2016 13:00:23 +0200 Subject: [PATCH 1/2] Rename file to remove trailing space --- src/main/java/me/legrange/mikrotik/{grammar.txt => grammar.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/java/me/legrange/mikrotik/{grammar.txt => grammar.txt} (100%) diff --git a/src/main/java/me/legrange/mikrotik/grammar.txt b/src/main/java/me/legrange/mikrotik/grammar.txt similarity index 100% rename from src/main/java/me/legrange/mikrotik/grammar.txt rename to src/main/java/me/legrange/mikrotik/grammar.txt From 7ef283df90958bce4926b611f29147b5c4df86fd Mon Sep 17 00:00:00 2001 From: Francois Steyn Date: Mon, 9 May 2016 13:03:41 +0200 Subject: [PATCH 2/2] Process multi-line "contents" variable when printing a file --- .../java/me/legrange/mikrotik/impl/ApiConnectionImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/me/legrange/mikrotik/impl/ApiConnectionImpl.java b/src/main/java/me/legrange/mikrotik/impl/ApiConnectionImpl.java index 328759a..4ae2cc6 100644 --- a/src/main/java/me/legrange/mikrotik/impl/ApiConnectionImpl.java +++ b/src/main/java/me/legrange/mikrotik/impl/ApiConnectionImpl.java @@ -312,6 +312,14 @@ public final class ApiConnectionImpl extends ApiConnection { if (parts.length == 3) { if (!parts[2].endsWith("\r")) { res.put(parts[1], unpackResult(parts[2])); + } else { + final StringBuilder sb = new StringBuilder(); + sb.append(parts[2]); + while (!lines.isEmpty()) { + nextLine(); + sb.append(line); + } + res.put(parts[1], sb.toString()); } } else { throw new ApiDataException(String.format("Malformed line '%s'", line));