affine/jobserv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

oops! wrong argument

Browse source
This commit is contained in:
Aidan Hahn 2019-05-22 01:01:12 -07:00
parent d8bcc82db1
commit 37cd129b8b
No known key found for this signature in database
GPG key ID: 327711E983899316
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/JobServ/JobServClient.java
View file

@ -237,7 +237,7 @@ public class JobServClient {
// parse remaining args // parse remaining args
switch (args[5]) { switch (args[5]) {
case "new": case "new":
if (args.length < 7) { if (args.length < 6) {
System.out.println("Improper formatting, try client --help"); System.out.println("Improper formatting, try client --help");
break; break;
} }
@ -252,7 +252,7 @@ public class JobServClient {
break; break;
case "output": case "output":
candidatePid = getPidArg(args, 7); candidatePid = getPidArg(args, 6);
if (candidatePid < 0) { if (candidatePid < 0) {
break; break;
} }
@ -262,7 +262,7 @@ public class JobServClient {
break; break;
case "status": case "status":
candidatePid = getPidArg(args, 7); candidatePid = getPidArg(args, 6);
if (candidatePid < 0) { if (candidatePid < 0) {
break; break;
} }
@ -272,7 +272,7 @@ public class JobServClient {
break; break;
case "kill": case "kill":
candidatePid = getPidArg(args, 7); candidatePid = getPidArg(args, 6);
if (candidatePid < 0) { if (candidatePid < 0) {
break; break;
} }
@ -282,7 +282,7 @@ public class JobServClient {
break; break;
case "return": case "return":
candidatePid = getPidArg(args, 7); candidatePid = getPidArg(args, 6);
if (candidatePid < 0) { if (candidatePid < 0) {
break; break;
} }

12
src/test/java/JobServ/JobServerAuthenticationTest.java
View file

@ -81,14 +81,14 @@ public class JobServerAuthenticationTest {
public JobServerAuthenticationTest() throws Exception { public JobServerAuthenticationTest() throws Exception {
try { try {
// generate SSL contexts // generate SSL contexts
SslContextBuilder serverContextBuilder = SslContextBuilder.forServer(new File(serverCert), SslContextBuilder serverContextBuilder = SslContextBuilder.forServer(new File(serverCert),
new File(serverKey)); new File(serverKey));
serverContextBuilder.trustManager(new File(clientCa)); serverContextBuilder.trustManager(new File(clientCa));
serverContextBuilder.clientAuth(ClientAuth.REQUIRE); serverContextBuilder.clientAuth(ClientAuth.REQUIRE);
this.server = new JobServServer(GrpcSslContexts.configure(serverContextBuilder).build(), 8448); this.server = new JobServServer(GrpcSslContexts.configure(serverContextBuilder).build(), 8448);
this.serverSslInitialized = true; this.serverSslInitialized = true;
} catch (SSLException e) { } catch (SSLException e) {
this.serverSslInitialized = false; this.serverSslInitialized = false;