From 37cd129b8ba1e9d695c7aba2d8060cf3fd12db2c Mon Sep 17 00:00:00 2001 From: Aidan Hahn Date: Wed, 22 May 2019 01:01:12 -0700 Subject: [PATCH] oops! wrong argument --- src/main/java/JobServ/JobServClient.java | 10 +++++----- .../java/JobServ/JobServerAuthenticationTest.java | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/JobServ/JobServClient.java b/src/main/java/JobServ/JobServClient.java index 344b0ae..94a69a6 100644 --- a/src/main/java/JobServ/JobServClient.java +++ b/src/main/java/JobServ/JobServClient.java @@ -237,7 +237,7 @@ public class JobServClient { // parse remaining args switch (args[5]) { case "new": - if (args.length < 7) { + if (args.length < 6) { System.out.println("Improper formatting, try client --help"); break; } @@ -252,7 +252,7 @@ public class JobServClient { break; case "output": - candidatePid = getPidArg(args, 7); + candidatePid = getPidArg(args, 6); if (candidatePid < 0) { break; } @@ -262,7 +262,7 @@ public class JobServClient { break; case "status": - candidatePid = getPidArg(args, 7); + candidatePid = getPidArg(args, 6); if (candidatePid < 0) { break; } @@ -272,7 +272,7 @@ public class JobServClient { break; case "kill": - candidatePid = getPidArg(args, 7); + candidatePid = getPidArg(args, 6); if (candidatePid < 0) { break; } @@ -282,7 +282,7 @@ public class JobServClient { break; case "return": - candidatePid = getPidArg(args, 7); + candidatePid = getPidArg(args, 6); if (candidatePid < 0) { break; } diff --git a/src/test/java/JobServ/JobServerAuthenticationTest.java b/src/test/java/JobServ/JobServerAuthenticationTest.java index 71a5db5..2bec0a9 100644 --- a/src/test/java/JobServ/JobServerAuthenticationTest.java +++ b/src/test/java/JobServ/JobServerAuthenticationTest.java @@ -81,14 +81,14 @@ public class JobServerAuthenticationTest { public JobServerAuthenticationTest() throws Exception { try { - // generate SSL contexts - SslContextBuilder serverContextBuilder = SslContextBuilder.forServer(new File(serverCert), + // generate SSL contexts + SslContextBuilder serverContextBuilder = SslContextBuilder.forServer(new File(serverCert), new File(serverKey)); - serverContextBuilder.trustManager(new File(clientCa)); - serverContextBuilder.clientAuth(ClientAuth.REQUIRE); + serverContextBuilder.trustManager(new File(clientCa)); + serverContextBuilder.clientAuth(ClientAuth.REQUIRE); - this.server = new JobServServer(GrpcSslContexts.configure(serverContextBuilder).build(), 8448); - this.serverSslInitialized = true; + this.server = new JobServServer(GrpcSslContexts.configure(serverContextBuilder).build(), 8448); + this.serverSslInitialized = true; } catch (SSLException e) { this.serverSslInitialized = false;