From 88e745346ec8bd0a4d6225873a8249722644082a Mon Sep 17 00:00:00 2001
From: Aidan Hahn <aidan@aidanis.online>
Date: Thu, 23 May 2019 22:38:39 -0700
Subject: [PATCH] removed superfluous return code from spec

---
 src/main/java/JobServ/JobServClient.java             | 6 +-----
 src/main/java/JobServ/JobServClientAPIConnector.java | 5 ++---
 src/main/java/JobServ/ProcessManager.java            | 6 +++---
 src/test/java/JobServ/ProcessManagerTest.java        | 2 +-
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/main/java/JobServ/JobServClient.java b/src/main/java/JobServ/JobServClient.java
index f348e82..0a041ac 100644
--- a/src/main/java/JobServ/JobServClient.java
+++ b/src/main/java/JobServ/JobServClient.java
@@ -101,14 +101,10 @@ public class JobServClient {
         int newProcess = this.api.sendNewJobMessage(command);
         switch(newProcess) {
         case -1:
-            System.out.println(this.serversideTimeoutErrorMessage);
+            System.out.println("Server failed to spawn process. Bad command.");
             break;
 
         case -2:
-            System.out.println("Server failed to create job, check server logs.");
-            break;
-
-        case -3:
             // error logged by API Connector
             break;
 
diff --git a/src/main/java/JobServ/JobServClientAPIConnector.java b/src/main/java/JobServ/JobServClientAPIConnector.java
index b8f39c3..b8d50ef 100644
--- a/src/main/java/JobServ/JobServClientAPIConnector.java
+++ b/src/main/java/JobServ/JobServClientAPIConnector.java
@@ -87,9 +87,8 @@ class JobServClientAPIConnector {
      * sendNewJobMessage()
      * sends a shell command to the api server
      * returns new pid of job
-     * or -1 if server thread couldnt synchronize before timeout
-     * or -2 if server failed to create job
-     * or -3 if client fails to connect
+     * or -1 if server failed to create job
+     * or -2 if client fails to connect
      */
     public int sendNewJobMessage(String command) {
         // thought of escaping this, but the vulnerability is only client side, from client user input.
diff --git a/src/main/java/JobServ/ProcessManager.java b/src/main/java/JobServ/ProcessManager.java
index dd955a1..ebac0b8 100644
--- a/src/main/java/JobServ/ProcessManager.java
+++ b/src/main/java/JobServ/ProcessManager.java
@@ -63,13 +63,13 @@ class ProcessManager {
     /*
      * newProcess()
      * Takes a command and returns the translated pid of a new process
-     * Returns -1 if getLock fails TODO: REMOVE
-     * Returns -2 if controller throws an IOException
+     * Returns -1 if controller throws an IOException
      */
     public int newProcess(String command) {
 
         try {
             ProcessController newProc = new ProcessController(command);
+            // we dont need to lock the map yet
             this.lockMap.put(newProc.getPid(), true);
             this.processMap.put(newProc.getPid(), newProc);
 
@@ -78,7 +78,7 @@ class ProcessManager {
 
         } catch (IOException e) {
             System.err.println("Couldnt Spawn New Command: " + e.getMessage());
-            return -2;
+            return -1;
         }
     }
 
diff --git a/src/test/java/JobServ/ProcessManagerTest.java b/src/test/java/JobServ/ProcessManagerTest.java
index d4104f1..c0bc851 100644
--- a/src/test/java/JobServ/ProcessManagerTest.java
+++ b/src/test/java/JobServ/ProcessManagerTest.java
@@ -48,7 +48,7 @@ public class ProcessManagerTest {
     @Test
     public void addProcessesTest() {
         int pid = manager.newProcess("sleep 1");
-        assertNotEquals(-2, pid);
+        assertNotEquals(-1, pid);
 
         manager.shutdown();
     }