Extend DetectVMInstallationsJob to consider JAVA.*_HOME env variables

HannesWell · HannesWell · commit 3ef1817b7d40 · 2026-02-19T17:46:56.000+01:00
This matches the behavior of the maven-toolchains-plugin
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DetectVMInstallationsJob.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DetectVMInstallationsJob.java
@@ -169,9 +169,9 @@ private Collection<File> computeCandidateVMs(StandardVMType standardType) {
 		if (jdkHome != null) {
 			directories.add(new File(jdkHome));
 		}
-		System.getenv().entrySet().forEach(entry -> {
-			if (entry.getKey().startsWith("JAVA_HOME_")) { //$NON-NLS-1$
-				directories.add(new File(entry.getValue()));
+		System.getenv().forEach((key, value) -> {
+			if (key.startsWith("JAVA_HOME_") || (key.startsWith("JAVA") && key.endsWith("_HOME"))) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				directories.add(new File(value));
 			}
 		});
 		// other common/standard lookup strategies can be added here

Original file line number	Diff line number	Diff line change
`@@ -169,9 +169,9 @@ private Collection<File> computeCandidateVMs(StandardVMType standardType) {`
`169`	`169`	`if (jdkHome != null) {`
`170`	`170`	`directories.add(new File(jdkHome));`
`171`	`171`	`}`
`172`		`- System.getenv().entrySet().forEach(entry -> {`
`173`		`- if (entry.getKey().startsWith("JAVA_HOME_")) { //$NON-NLS-1$`
`174`		`- directories.add(new File(entry.getValue()));`
	`172`	`+ System.getenv().forEach((key, value) -> {`
	`173`	`+ if (key.startsWith("JAVA_HOME_") \|\| (key.startsWith("JAVA") && key.endsWith("_HOME"))) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$`
	`174`	`+ directories.add(new File(value));`
`175`	`175`	`}`
`176`	`176`	`});`
`177`	`177`	`// other common/standard lookup strategies can be added here`