Merge pull request #157 from mikedrob/quotes

Quotes

2 files changed, 31 insertions, 1 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/test/QuotedMainTest.java b/src/test/java/test/QuotedMainTest.java
new file mode 100644
index 0000000..abb97c0
--- /dev/null
+++ b/src/test/java/test/QuotedMainTest.java
@@ -0,0 +1,29 @@
+package test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import com.beust.jcommander.JCommander;
+import com.beust.jcommander.Parameter;
+
+public class QuotedMainTest {
+  @Parameter
+  List<String> args = new ArrayList<String>();
+  
+  String quoted = "\" \"";
+
+  @Test
+  public void testMain() {
+    JCommander jc = new JCommander(this);
+    jc.parse(quoted);
+    Assert.assertEquals(args.size(), 1);
+    Assert.assertEquals(args.get(0), " ");
+  }
+  
+  public static void main(String[] args) {
+    new QuotedMainTest().testMain();
+  }
+}