bug no. 11680 resolved

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/cli/trunk@129800 13f79535-47bb-0310-9956-ffa450edef68

Author: John Keyes

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

@@ -168,12 +168,14 @@ public String getOptionValue( char opt ) {
     public String[] getOptionValues( String opt ) {
         List values = new java.util.ArrayList();
 
-        List opts = (List)options.get( opt );
-        Iterator iter = opts.iterator();
+        if( options.containsKey( opt ) ) {
+            List opts = (List)options.get( opt );
+            Iterator iter = opts.iterator();
 
-        while( iter.hasNext() ) {
-            Option optt = (Option)iter.next();
-            values.addAll( optt.getValuesList() );
+            while( iter.hasNext() ) {
+                Option optt = (Option)iter.next();
+                values.addAll( optt.getValuesList() );
+            }
         }
         return (values.size() == 0) ? null : (String[])values.toArray(new String[]{});
     }

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

@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) The Apache Software Foundation. All rights reserved.
+ *
+ * This software is published under the terms of the Apache Software License
+ * version 1.1, a copy of which has been included with this distribution in
+ * the LICENSE file.
+ * 
+ * $Id: BugsTest.java,v 1.1 2002/08/15 20:31:23 jkeyes Exp $
+ */
+
+package org.apache.commons.cli;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class BugsTest extends TestCase
+{
+    /** CommandLine instance */
+    private CommandLine _cmdline = null;
+    private Option _option = null;
+
+    public static Test suite() { 
+        return new TestSuite( BugsTest.class );
+    }
+
+    public BugsTest( String name )
+    {
+        super( name );
+    }
+
+    public void setUp()
+    {
+    }
+
+    public void tearDown()
+    {
+    }
+
+    public void test11680()
+    {
+        Options options = new Options();
+        options.addOption("f", true, "foobar");
+	options.addOption("m", true, "missing");
+        String[] args = new String[] { "-f" , "foo" };
+
+        CommandLineParser parser = CommandLineParserFactory.newParser();
+
+        try {
+            CommandLine cmd = parser.parse( options, args );
+
+            try {
+                cmd.getOptionValue( "f", "default f");
+                cmd.getOptionValue( "m", "default m");
+            }
+            catch( NullPointerException exp ) {
+                fail( "NullPointer caught: " + exp.getMessage() );
+            }
+        }
+        catch( ParseException exp ) {
+            fail( "Unexpected Exception: " + exp.getMessage() );
+        }
+
+
+    }
+}