sercer: fix one arg cmd, traces
authorNiki Roo <niki@nikiroo.be>
Mon, 22 Apr 2019 09:22:49 +0000 (11:22 +0200)
committerNiki Roo <niki@nikiroo.be>
Mon, 22 Apr 2019 09:22:49 +0000 (11:22 +0200)
src/be/nikiroo/fanfix/library/RemoteLibrary.java
src/be/nikiroo/fanfix/library/RemoteLibraryServer.java

index 884eee9a114d2c40853fb6659044bf4b0b3122e9..3318c12bf7e5f55e743091aede40e9998d28ccd0 100644 (file)
@@ -134,8 +134,8 @@ public class RemoteLibrary extends BasicLibrary {
                        new ConnectActionClientObject(host, port, false) {
                                @Override
                                public void action(Version serverVersion) throws Exception {
-                                       Object rep = sendCmd(this,
-                                                       new Object[] { "GET_CUSTOM_COVER", type, source });
+                                       Object rep = sendCmd(this, new Object[] {
+                                                       "GET_CUSTOM_COVER", type, source });
                                        result[0] = (Image) rep;
                                }
 
@@ -177,8 +177,7 @@ public class RemoteLibrary extends BasicLibrary {
                                        }
 
                                        List<Object> list = new ArrayList<Object>();
-                                       for (Object obj = send(null); obj != null; obj = send(
-                                                       null)) {
+                                       for (Object obj = send(null); obj != null; obj = send(null)) {
                                                list.add(obj);
                                                pg.add(1);
                                        }
@@ -500,9 +499,8 @@ public class RemoteLibrary extends BasicLibrary {
                                                pg = new Progress();
                                        }
 
-                                       
-                                       Object rep = sendCmd(this,
-                                                       new Object[] { "GET_METADATA", luid });
+                                       Object rep = sendCmd(this, new Object[] { "GET_METADATA",
+                                                       luid });
 
                                        while (true) {
                                                if (!RemoteLibraryServer.updateProgress(pg, rep)) {
@@ -540,11 +538,6 @@ public class RemoteLibrary extends BasicLibrary {
                Object rep = action.send(params);
 
                String hash = hashKey(key, "" + rep);
-               rep = action.send(hash);
-               if (rep == null) {
-                       throw new java.lang.IllegalArgumentException();
-               }
-
                return action.send(hash);
        }
 
index f0d5f7aea0722e68c39d0835e36f85c41b0e65e3..a40103c0b40f5d6e18995609b5731f5fda918a50 100644 (file)
@@ -87,7 +87,7 @@ public class RemoteLibraryServer extends ServerObject {
                Object[] args = new Object[0];
                if (data instanceof Object[]) {
                        Object[] dataArray = (Object[]) data;
-                       if (dataArray.length >= 2) {
+                       if (dataArray.length > 0) {
                                command = "" + dataArray[0];
 
                                args = new Object[dataArray.length - 1];