X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FServerBridge.java;h=db50876b32aafb144bc89047e73073c391c569f8;hp=ea9fd1b3d3514439d813299b9a77128d6e4f6f9d;hb=a359464fcf59af8abc6f69ae0e88e42adc6018df;hpb=bb60bd13efae59e804e5d7a5a7590a020835966f diff --git a/src/be/nikiroo/utils/serial/server/ServerBridge.java b/src/be/nikiroo/utils/serial/server/ServerBridge.java index ea9fd1b..db50876 100644 --- a/src/be/nikiroo/utils/serial/server/ServerBridge.java +++ b/src/be/nikiroo/utils/serial/server/ServerBridge.java @@ -238,8 +238,12 @@ public class ServerBridge extends Server { if (getTraceHandler().getTraceLevel() >= 2) { try { - if (data.startsWith("ZIP:")) { - data = StringUtils.unzip64(data.substring(4)); + while (data.startsWith("ZIP:") || data.startsWith("B64:")) { + if (data.startsWith("ZIP:")) { + data = StringUtils.unbase64s(data.substring(4), true); + } else if (data.startsWith("B64:")) { + data = StringUtils.unbase64s(data.substring(4), false); + } } Object obj = new Importer().read(data).getValue();