Less branching.

Author: garydgregory

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

@@ -454,11 +454,7 @@ public Iterator<Option> iterator() {
     private Option resolveOption(String opt) {
         opt = Util.stripLeadingHyphens(opt);
         for (final Option option : options) {
-            if (opt.equals(option.getOpt())) {
-                return option;
-            }
-
-            if (opt.equals(option.getLongOpt())) {
+            if (opt.equals(option.getOpt()) || opt.equals(option.getLongOpt())) {
                 return option;
             }
 

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

@@ -473,10 +473,7 @@ public boolean equals(final Object o) {
 
         final Option option = (Option) o;
 
-        if (opt != null ? !opt.equals(option.opt) : option.opt != null) {
-            return false;
-        }
-        if (longOpt != null ? !longOpt.equals(option.longOpt) : option.longOpt != null) {
+        if ((opt != null ? !opt.equals(option.opt) : option.opt != null) || (longOpt != null ? !longOpt.equals(option.longOpt) : option.longOpt != null)) {
             return false;
         }
 

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

@@ -66,20 +66,20 @@ protected void burstToken(final String token, final boolean stopAtNonOption) {
         for (int i = 1; i < token.length(); i++) {
             final String ch = String.valueOf(token.charAt(i));
 
-            if (options.hasOption(ch)) {
-                tokens.add("-" + ch);
-                currentOption = options.getOption(ch);
-
-                if (currentOption.hasArg() && token.length() != i + 1) {
-                    tokens.add(token.substring(i + 1));
-
-                    break;
+            if (!options.hasOption(ch)) {
+                if (stopAtNonOption) {
+                    processNonOptionToken(token.substring(i), true);
+                } else {
+                    tokens.add(token);
                 }
-            } else if (stopAtNonOption) {
-                processNonOptionToken(token.substring(i), true);
                 break;
-            } else {
-                tokens.add(token);
+            }
+            tokens.add("-" + ch);
+            currentOption = options.getOption(ch);
+
+            if (currentOption.hasArg() && token.length() != i + 1) {
+                tokens.add(token.substring(i + 1));
+
                 break;
             }
         }