Lookup key in map only once

Author: garydgregory

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

@@ -225,11 +225,8 @@ public List<String> getMatchingOptions(String opt) {
     public Option getOption(String opt) {
         opt = Util.stripLeadingHyphens(opt);
 
-        if (shortOpts.containsKey(opt)) {
-            return shortOpts.get(opt);
-        }
-
-        return longOpts.get(opt);
+        final Option option = shortOpts.get(opt);
+        return option != null ? option : longOpts.get(opt);
     }
 
     /**