Improve TraceHandler, fix server system + tests:

[nikiroo-utils.git] / src / be / nikiroo / utils / serial / ConnectAction.java

diff --git a/src/be/nikiroo/utils/serial/ConnectAction.java b/src/be/nikiroo/utils/serial/ConnectAction.java
index 1f9833624c552516efa821c214cbb74765f82a55..2a25c5b1c62e9f6a15778e200b04603637fa747a 100644 (file)
--- a/src/be/nikiroo/utils/serial/ConnectAction.java
+++ b/src/be/nikiroo/utils/serial/ConnectAction.java
@@ -42,6 +42,7 @@ abstract class ConnectAction {
                }).start();
        }
 
+       // connect, do the action (sync)
        public void connect() {
                try {
                        in = new BufferedReader(new InputStreamReader(s.getInputStream(),
@@ -81,7 +82,11 @@ abstract class ConnectAction {
                        NoSuchMethodException, ClassNotFoundException {
                synchronized (lock) {
                        String rep = sendString(new Exporter().append(data).toString(true));
-                       return new Importer().read(rep).getValue();
+                       if (rep != null) {
+                               return new Importer().read(rep).getValue();
+                       }
+
+                       return null;
                }
        }