Skip to content

Fix JvmConfigurator #45

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

Open
snjeza wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix JvmConfigurator #45

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
11 changes: 9 additions & 2 deletions ...l.eclipse.core/src/com/salesforce/bazel/eclipse/core/model/discovery/JvmConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public IVMInstall configureVMInstall(java.nio.file.Path resolvedJavaHomePath, Ba
getPrefix(vmType),
resolvedJavaHomePath.getFileName().toString(),
bazelWorkspace.getName());
var vm = findVmForNameOrPath(resolvedJavaHomePath, name);
var vm = findVmForNameOrPath(resolvedJavaHomePath, name, bazelWorkspace, vmType);

// delete if location or other attributes don't not match
if ((vm instanceof AbstractVMInstall realVm) && (!vm.getInstallLocation().toPath().equals(resolvedJavaHomePath)
Expand Down Expand Up @@ -239,12 +239,19 @@ private void enablePreviewIfPossible(IJavaProject javaProject, String version) {
}
}

private IVMInstall findVmForNameOrPath(java.nio.file.Path javaHome, String name) {
private IVMInstall findVmForNameOrPath(java.nio.file.Path javaHome, String name, BazelWorkspace bazelWorkspace,
String vmType) {
var file = javaHome.toFile();
var types = JavaRuntime.getVMInstallTypes();
for (IVMInstallType type : types) {
var installs = type.getVMInstalls();
for (IVMInstall install : installs) {
if (!(install instanceof AbstractVMInstall realVm)
|| !bazelWorkspace.getLocation().toString().equals(realVm.getAttribute(VM_ATTR_WORKSPACE))
|| !vmType.equals(realVm.getAttribute(VM_ATTR_TYPE))) {
continue;
}

if ((name != null) && name.equals(install.getName())) {
return install;
}
Expand Down
Loading