X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FServerBridge.java;h=db50876b32aafb144bc89047e73073c391c569f8;hb=a359464fcf59af8abc6f69ae0e88e42adc6018df;hp=157b27ee9cc0df8c620a6163e5d0ae524d4b4e57;hpb=7d048df41aea44c07ea6e1ab774c627053f39dfa;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/serial/server/ServerBridge.java b/src/be/nikiroo/utils/serial/server/ServerBridge.java
index 157b27e..db50876 100644
--- a/src/be/nikiroo/utils/serial/server/ServerBridge.java
+++ b/src/be/nikiroo/utils/serial/server/ServerBridge.java
@@ -220,7 +220,7 @@ public class ServerBridge extends Server {
 	 *            the data to trace
 	 */
 	private void trace(String prefix, String data) {
-		int size = data.length();
+		int size = data == null ? 0 : data.length();
 		String ssize = size + " byte";
 		if (size > 1) {
 			ssize = size + " bytes";
@@ -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();