diff -r b254dbc0ee6f -r 4e61ba4a71b4 jdk/src/java.base/windows/native/libjli/java_md.c
--- a/jdk/src/java.base/windows/native/libjli/java_md.c	Thu Jul 21 10:02:12 2016 +0800
+++ b/jdk/src/java.base/windows/native/libjli/java_md.c	Wed Jul 20 20:47:42 2016 +0200
@@ -1006,10 +1006,11 @@
     // make a copy of the args which will be expanded in java if required.
     nargv = (char **)JLI_MemAlloc(argc * sizeof(char*));
     for (i = 0; i < argc; i++) {
+        jboolean arg_expand;
         j = appArgIdx[i];
-        jboolean arg_expand = (JLI_StrCmp(stdargs[j].arg, strv[i]) == 0)
-                                ? stdargs[j].has_wildcard
-                                : JNI_FALSE;
+        arg_expand = (JLI_StrCmp(stdargs[j].arg, strv[i]) == 0)
+            ? stdargs[j].has_wildcard
+            : JNI_FALSE;
         if (needs_expansion == JNI_FALSE)
             needs_expansion = arg_expand;