bugfix to address quoted main params

2 files changed, 4 insertions, 2 deletions

diff --git a/src/main/java/com/beust/jcommander/JCommander.java b/src/main/java/com/beust/jcommander/JCommander.java
index 1bc0084..b78d890 100644
--- a/src/main/java/com/beust/jcommander/JCommander.java
+++ b/src/main/java/com/beust/jcommander/JCommander.java
@@ -680,6 +680,7 @@ public class JCommander {
     while (i < args.length && ! commandParsed) {
       String arg = args[i];
       String a = trim(arg);
+      args[i] = a;
       p("Parsing arg: " + a);
 
       JCommander jc = findCommandByAlias(arg);
@@ -748,7 +749,7 @@ public class JCommander {
             // Regular (non-command) parsing
             //
             List mp = getMainParameter(arg);
-            String value = arg;
+            String value = a; // If there's a non-quoted version, prefer that one
             Object convertedValue = value;
 
             if (m_mainParameter.getGenericType() instanceof ParameterizedType) {
diff --git a/src/test/java/com/mdrob/jcommander/QuotedMainTest.java b/src/test/java/test/QuotedMainTest.java
index 9b0cbb3..abb97c0 100644
--- a/src/test/java/com/mdrob/jcommander/QuotedMainTest.java
+++ b/src/test/java/test/QuotedMainTest.java
@@ -1,4 +1,4 @@
-package com.mdrob.jcommander;
+package test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,6 +20,7 @@ public class QuotedMainTest {
     JCommander jc = new JCommander(this);
     jc.parse(quoted);
     Assert.assertEquals(args.size(), 1);
+    Assert.assertEquals(args.get(0), " ");
   }
   
   public static void main(String[] args) {