Skip to content

Commit 3cfecc8

Browse files
authored
fix - Gradle server jvm opts alignment (#1541)
1 parent 702d1cc commit 3cfecc8

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

Diff for: .vscode/launch.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"order": 2
5555
},
5656
"env": {
57-
"GRADLE_SERVER_OPTS":"-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8089"
57+
"DEBUG_GRADLE_SERVER": "true",
5858
},
5959
},
6060
{

Diff for: extension/src/constant.ts

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ export const NO_JAVA_EXECUTABLE =
2323

2424
export const OPT_RESTART = "Restart";
2525

26+
export const GRADLE_SERVER_BASE_JVM_OPTS =
27+
"--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.prefs/java.util.prefs=ALL-UNNAMED --add-opens=java.base/java.nio.charset=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED";
28+
2629
export enum CompletionKinds {
2730
DEPENDENCY_GROUP = "dependency_group",
2831
DEPENDENCY_ARTIFACT = "dependency_artifact",

Diff for: extension/src/server/serverUtil.ts

+7
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {
44
getConfigJavaImportGradleJavaHome,
55
getRedHatJavaEmbeddedJRE,
66
} from "../util/config";
7+
import { GRADLE_SERVER_BASE_JVM_OPTS } from "../constant";
78

89
export function getGradleServerCommand(): string {
910
const platform = process.platform;
@@ -27,6 +28,12 @@ export async function getGradleServerEnv(): Promise<ProcessEnv | undefined> {
2728
Object.assign(env, {
2829
VSCODE_JAVA_HOME: javaHome,
2930
});
31+
if (env["DEBUG_GRADLE_SERVER"] === "true") {
32+
env.GRADLE_SERVER_OPTS =
33+
"-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8089 " + GRADLE_SERVER_BASE_JVM_OPTS;
34+
} else {
35+
env.GRADLE_SERVER_OPTS = GRADLE_SERVER_BASE_JVM_OPTS;
36+
}
3037
} else if (!checkEnvJavaExecutable()) {
3138
return undefined;
3239
}

0 commit comments

Comments
 (0)