From d0f841ed6da3a12a321f9b49604928f1047ad035 Mon Sep 17 00:00:00 2001
From: Alinga Yeung <Alinga.Yeung@nrc-cnrc.gc.ca>
Date: Mon, 14 Sep 2015 09:45:31 -0700
Subject: [PATCH] Story 1840. Simplified code.
---
.../src/ca/nrc/cadc/ac/admin/CmdLineParser.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/CmdLineParser.java b/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/CmdLineParser.java
index 2beee1c5..a7789550 100644
--- a/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/CmdLineParser.java
+++ b/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/CmdLineParser.java
@@ -200,8 +200,7 @@ public class CmdLineParser
}
}
- protected boolean isValid(final ArgumentMap am, final PrintStream outStream,
- final PrintStream errStream) throws UsageException
+ protected boolean isValid(final ArgumentMap am) throws UsageException
{
int count = 0;
@@ -253,8 +252,6 @@ public class CmdLineParser
if (count == 1)
{
- this.command.setSystemOut(outStream);
- this.command.setSystemErr(errStream);
return true;
}
else
@@ -285,7 +282,7 @@ public class CmdLineParser
{
this.proceed = false;
- if (!am.isSet("h") && !am.isSet("help") && isValid(am, out, err))
+ if (!am.isSet("h") && !am.isSet("help") && isValid(am))
{
Subject subject = CertCmdArgUtil.initSubject(am, true);
@@ -300,13 +297,17 @@ public class CmdLineParser
if (am.isSet("list"))
{
// we can use anonymous subject
- this.proceed = true;
+ this.proceed = true;
}
else
{
throw e;
}
}
+
+ // the following statements are executed only when proceed is true
+ this.command.setSystemOut(out);
+ this.command.setSystemErr(err);
}
}
--
GitLab