Fix various bugs with SetArgs and GetArgs commands (manifests as vari…

…ous IOException errors in log files)

git-svn-id: https://sagetv-addons.googlecode.com/svn/trunk/sjq4@1401 4d529e3f-d655-0410-97be-dbb2a4780eb3

src/com/google/code/sagetvaddons/sjq/server/commands/Getargs.java

@@ -27,7 +27,8 @@
  * <p>Provides the ability to dynamic exe args as set by the task's test script
  * <p><pre>
  *    R: long (task id)
- *    W: String[] (args, null if no override set)
+ *    W: boolean (true if override exists or false if none is defined)
+ *    W: String (args, read but ignored if boolean above = false)
  * </pre></p>
  * @author dbattams
  * @version $Id$
@@ -49,7 +50,14 @@ public Getargs(ObjectInputStream in, ObjectOutputStream out) {
 	@Override
 	public void execute() throws IOException {
 		long taskId = getIn().readLong();
-		getOut().writeUTF(TaskQueue.get().getExeArgs(taskId));
+		String args = TaskQueue.get().getExeArgs(taskId);
+		boolean hasArgs = true;
+		if(args == null) {
+			args = "";
+			hasArgs = false;
+		}
+		getOut().writeBoolean(hasArgs);
+		getOut().writeUTF(args);
 		getOut().writeObject(NetworkAck.get(NetworkAck.OK));
 		getOut().flush();
 	}

src/com/google/code/sagetvaddons/sjq/server/commands/Setargs.java

@@ -27,7 +27,8 @@
  * <p>Provides the ability to dynamically set the args for an exe from its test script
  * <p><pre>
  *    R: long (task id)
- *    R: String[] (args)
+ *    R: bool (isNotNull)
+ *    R: String (args)
  *    W: ACK
  * </pre></p>
  * @author dbattams
@@ -50,8 +51,9 @@ public Setargs(ObjectInputStream in, ObjectOutputStream out) {
 	@Override
 	public void execute() throws IOException {
 		long taskId = getIn().readLong();
+		boolean isOverride = getIn().readBoolean();
 		String args = (String)getIn().readUTF();
-		boolean result = TaskQueue.get().setExeArgs(taskId, args);
+		boolean result = TaskQueue.get().setExeArgs(taskId, isOverride ? args : null);
 		getOut().writeObject(NetworkAck.get(result ? NetworkAck.OK : NetworkAck.ERR));
 		getOut().flush();
 	}