--- old/src/share/vm/runtime/arguments.cpp	2017-06-28 15:45:04.000000000 -0700
+++ new/src/share/vm/runtime/arguments.cpp	2017-06-28 15:45:04.000000000 -0700
@@ -148,8 +148,8 @@
 static bool match_option(const JavaVMOption* option, const char** names, const char** tail,
   bool tail_allowed) {
   for (/* empty */; *names != NULL; ++names) {
-    if (match_option(option, *names, tail)) {
-      if (**tail == '\0' || tail_allowed && **tail == ':') {
+  if (match_option(option, *names, tail)) {
+      if (**tail == '\0' || (tail_allowed && **tail == ':')) {
         return true;
       }
     }