reset internal state at start of parse(); improve error message for m…

…issing required Options This closes #3
remkop · Feb 4, 2017 · 3e3bc83 · 3e3bc83
1 parent 9fa54f9
commit 3e3bc83
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/picocli/CommandLine.java b/src/main/java/picocli/CommandLine.java
@@ -644,6 +644,8 @@ Object parse(String... args) {
                 int arity = positionalParametersField.getAnnotation(Parameters.class).arity();
                 assertNoMissingParameters(positionalParametersField, arity, args.length);
             }
+            // first reset any state in case this CommandLine instance is being reused
+            isHelpRequested = false;
             Set<Field> required = new HashSet<Field>(requiredFields);
             for (int i = 0; i < args.length; i++) {
                 String arg = trim(args[i]);
@@ -1127,13 +1129,14 @@ public MissingParameterException(String msg) {
 
         private static MissingParameterException create(Set<Field> missing) {
             if (missing.size() == 1) {
-                return new MissingParameterException(missing.iterator().next().getName());
+                return new MissingParameterException("Missing required option '"
+                        + missing.iterator().next().getName() + "'");
             }
             List<String> names = new ArrayList<String>(missing.size());
             for (Field field : missing) {
                 names.add(field.getName());
             }
-            return new MissingParameterException("Missing options " + names.toString());
+            return new MissingParameterException("Missing required options " + names.toString());
         }
     }