--- a/jdk/src/java.base/share/native/libjli/java.c	Wed Jan 04 18:32:19 2017 +0100
+++ b/jdk/src/java.base/share/native/libjli/java.c	Wed Jan 04 09:50:21 2017 -0800
@@ -1248,6 +1248,7 @@
         char *value = NULL;
         int kind = GetOpt(&argc, &argv, &option, &value);
         jboolean has_arg = value != NULL && JLI_StrLen(value) > 0;
+        jboolean has_arg_any_len = value != NULL;
 
 /*
  * Option to set main entry point
@@ -1269,7 +1270,7 @@
                    JLI_StrCCmp(arg, "--class-path=") == 0 ||
                    JLI_StrCmp(arg, "-classpath") == 0 ||
                    JLI_StrCmp(arg, "-cp") == 0) {
-            REPORT_ERROR (has_arg, ARG_ERROR1, arg);
+            REPORT_ERROR (has_arg_any_len, ARG_ERROR1, arg);
             SetClassPath(value);
             mode = LM_CLASS;
         } else if (JLI_StrCmp(arg, "--list-modules") == 0 ||