Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8211033: Clean up the processing -classpath argument not to set LM_CLASS #21971

Closed
wants to merge 1 commit into from
+3 −5
Closed

8211033: Clean up the processing -classpath argument not to set LM_CLASS #21971

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/java.base/share/native/libjli/java.c
View file
Original file line number Diff line number Diff line change
@@ -1198,9 +1198,6 @@ ParseArguments(int *pargc, char ***pargv,
JLI_StrCmp(arg, "-cp") == 0) {
REPORT_ERROR (has_arg_any_len, ARG_ERROR1, arg);
SetClassPath(value);
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) {
@@ -1355,11 +1352,12 @@ ParseArguments(int *pargc, char ***pargv,
*pret = 1;
}
} else if (mode == LM_UNKNOWN) {
/* default to LM_CLASS if -m, -jar and -cp options are
* not specified */
if (!_have_classpath) {
SetClassPath(".");
}
/* If neither of -m, -jar, --source option is set, then the
* launcher mode is LM_UNKNOWN. In such cases, we determine the
* mode as LM_CLASS or LM_SOURCE per the input file. */
mode = IsSourceFile(arg) ? LM_SOURCE : LM_CLASS;
} else if (mode == LM_CLASS && IsSourceFile(arg)) {
/* override LM_CLASS mode if given a source file */