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.

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

[7.x] Provide better error message when jdk metadata cannot be resolved (#76607) #76608

Merged
merged 1 commit into from
Aug 17, 2021
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.gradle.jvm.toolchain.internal.InstallationLocation;
import org.gradle.jvm.toolchain.internal.JavaInstallationRegistry;
import org.gradle.util.GradleVersion;
import org.jetbrains.annotations.NotNull;

import javax.inject.Inject;
import java.io.BufferedReader;
Expand Down Expand Up @@ -68,7 +67,7 @@ public GlobalBuildInfoPlugin(
ProviderFactory providers
) {
this.javaInstallationRegistry = javaInstallationRegistry;
this.metadataDetector = metadataDetector;
this.metadataDetector = new ErrorTraceMetadataDetector(metadataDetector);
this.providers = providers;
}

Expand Down Expand Up @@ -364,5 +363,21 @@ public static String getResourceContents(String resourcePath) {
}
}

private static class ErrorTraceMetadataDetector implements JvmMetadataDetector {
private final JvmMetadataDetector delegate;

ErrorTraceMetadataDetector(JvmMetadataDetector delegate) {
this.delegate = delegate;
}

@Override
public JvmInstallationMetadata getMetadata(File file) {
JvmInstallationMetadata metadata = delegate.getMetadata(file);
if(metadata instanceof JvmInstallationMetadata.FailureInstallationMetadata) {
throw new GradleException("Jvm Metadata cannot be resolved for " + metadata.getJavaHome().toString());
}
return metadata;
}
}

}