[CLI-317] NullPointerException thrown by CommandLineParser.parse()

Author: garydgregory

src/main/java/org/apache/commons/cli/Option.java

@@ -201,6 +201,7 @@ public Builder option(final String option) throws IllegalArgumentException {
          * @return this builder, to allow method chaining
          */
         public Builder optionalArg(final boolean optionalArg) {
+            this.argCount = optionalArg ? 1 : UNINITIALIZED;
             this.optionalArg = optionalArg;
             return this;
         }

src/test/java/org/apache/commons/cli/AbstractParserTestCase.java

@@ -75,12 +75,13 @@ public void testAmbiguousLongWithoutEqualSingleDash() throws Exception {
         assertEquals("bar", cl.getOptionValue("foo"));
     }
 
+    @Test
     public void testAmbiguousLongWithoutEqualSingleDash2() throws Exception {
         final String[] args = {"-b", "-foobar"};
 
         final Options options = new Options();
-        options.addOption(Option.builder().option("f").longOpt("foo").optionalArg(true).build());
-        options.addOption(Option.builder().option("b").longOpt("bar").optionalArg(false).build());
+        options.addOption(Option.builder().longOpt("foo").option("f").optionalArg(true).build());
+        options.addOption(Option.builder().longOpt("bar").option("b").optionalArg(false).build());
 
         final CommandLine cl = parser.parse(options, args);
 

src/test/java/org/apache/commons/cli/OptionTest.java

@@ -131,7 +131,7 @@ public void testBuilderMethods() {
             String.class);
         checkOption(Option.builder("a").desc("desc").optionalArg(false).build(), "a", "desc", null, Option.UNINITIALIZED, null, false, false, defaultSeparator,
             String.class);
-        checkOption(Option.builder("a").desc("desc").optionalArg(true).build(), "a", "desc", null, Option.UNINITIALIZED, null, false, true, defaultSeparator,
+        checkOption(Option.builder("a").desc("desc").optionalArg(true).build(), "a", "desc", null, 1, null, false, true, defaultSeparator,
             String.class);
         checkOption(Option.builder("a").desc("desc").valueSeparator(':').build(), "a", "desc", null, Option.UNINITIALIZED, null, false, false, ':',
             String.class);