Defer the Option clone until after the no-arg skip check

Signed-off-by: farkhalit rida <farkhlait@sproutxp.com>

Author: farkhalit

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

@@ -518,16 +518,15 @@ private void handleProperties(final Properties properties) throws ParseException
             if (!cmd.hasOption(option) && !selected) {
                 // get the value from the properties
                 final String value = properties.getProperty(option);
-                // the Options belong to the caller and outlive this parse, so hold the value on a copy
-                final Option copy = (Option) opt.clone();
-                if (copy.hasArg()) {
-                    if (copy.isValuesEmpty()) {
-                        copy.processValue(stripLeadingAndTrailingQuotesDefaultOff(value));
-                    }
-                } else if (!("yes".equalsIgnoreCase(value) || "true".equalsIgnoreCase(value) || "1".equalsIgnoreCase(value))) {
+                if (!opt.hasArg() && !("yes".equalsIgnoreCase(value) || "true".equalsIgnoreCase(value) || "1".equalsIgnoreCase(value))) {
                     // if the value is not yes, true or 1 then don't add the option to the CommandLine
                     continue;
                 }
+                // the Options belong to the caller and outlive this parse, so hold the value on a copy
+                final Option copy = (Option) opt.clone();
+                if (copy.hasArg() && copy.isValuesEmpty()) {
+                    copy.processValue(stripLeadingAndTrailingQuotesDefaultOff(value));
+                }
                 handleOption(copy);
                 currentOption = null;
             }

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

@@ -284,21 +284,20 @@ protected void processProperties(final Properties properties) throws ParseExcept
             if (!cmd.hasOption(option) && !selected) {
                 // get the value from the properties instance
                 final String value = properties.getProperty(option);
-                // the Options belong to the caller and outlive this parse, so hold the value on a copy
-                final Option copy = (Option) opt.clone();
-                if (copy.hasArg()) {
-                    if (copy.isValuesEmpty()) {
-                        try {
-                            copy.processValue(value);
-                        } catch (final RuntimeException exp) { // NOPMD
-                            // if we cannot add the value don't worry about it
-                        }
-                    }
-                } else if (!("yes".equalsIgnoreCase(value) || "true".equalsIgnoreCase(value) || "1".equalsIgnoreCase(value))) {
+                if (!opt.hasArg() && !("yes".equalsIgnoreCase(value) || "true".equalsIgnoreCase(value) || "1".equalsIgnoreCase(value))) {
                     // if the value is not yes, true or 1 then don't add the
                     // option to the CommandLine
                     continue;
                 }
+                // the Options belong to the caller and outlive this parse, so hold the value on a copy
+                final Option copy = (Option) opt.clone();
+                if (copy.hasArg() && copy.isValuesEmpty()) {
+                    try {
+                        copy.processValue(value);
+                    } catch (final RuntimeException exp) { // NOPMD
+                        // if we cannot add the value don't worry about it
+                    }
+                }
                 cmd.addOption(copy);
                 updateRequiredOptions(copy);
             }