--- a/src/java.base/share/native/libjli/java.c	Fri Sep 21 14:50:06 2018 -0700
+++ b/src/java.base/share/native/libjli/java.c	Fri Sep 21 15:38:43 2018 -0700
@@ -1326,7 +1326,9 @@
                    JLI_StrCmp(arg, "-cp") == 0) {
             REPORT_ERROR (has_arg_any_len, ARG_ERROR1, arg);
             SetClassPath(value);
-            mode = LM_CLASS;
+            if (mode != LM_SOURCE) {
+                mode = LM_CLASS;
+            }
         } else if (JLI_StrCmp(arg, "--list-modules") == 0) {
             listModules = JNI_TRUE;
         } else if (JLI_StrCmp(arg, "--show-resolved-modules") == 0) {