--- old/src/java.base/share/native/launcher/main.c	2015-11-25 11:47:16.076811100 -0800
+++ new/src/java.base/share/native/launcher/main.c	2015-11-25 11:47:15.701771800 -0800
@@ -110,17 +110,9 @@
             }
         }
     }
-    JLI_CmdToArgs(GetCommandLine());
-    margc = JLI_GetStdArgc();
-    // add one more to mark the end
-    margv = (char **)JLI_MemAlloc((margc + 1) * (sizeof(char *)));
-    {
-        int i = 0;
-        StdArg *stdargs = JLI_GetStdArgs();
-        for (i = 0 ; i < margc ; i++) {
-            margv[i] = stdargs[i].arg;
-        }
-        margv[i] = NULL;
+
+    if (!JLI_DecodeArgs(&margc, &margv)) {
+        exit(1);
     }
 #else /* *NIXES */
     {