Skip to content

Don't return null Jdk locations #157

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

Closed
KirillOsenkov wants to merge 1 commit into from
Closed

Don't return null Jdk locations #157

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
6 changes: 4 additions & 2 deletions src/Xamarin.Android.Tools.AndroidSdk/Jdks/JdkLocations.MacOS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ static IEnumerable<string> GetUnixConfiguredJdkPaths (Action<TraceLevel, string>
{
var config = AndroidSdkUnix.GetUnixConfigFile (logger);
foreach (var java_sdk in config.Root.Elements ("java-sdk")) {
var path = (string) java_sdk.Attribute ("path");
yield return path;
var path = (string) java_sdk.Attribute ("path");
Copy link
Contributor

@jonpryor jonpryor Feb 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nullable reference types are enabled, and the original code -- as well as this updated code -- is "disabling" NRT by asserting that string and not string? is returned.

Copy link
Member Author

@KirillOsenkov KirillOsenkov Feb 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I opted for the minimal surgical fix to solve the problem since I'm in an unfamiliar codebase. I can leave more comprehensive fix options to the maintainers. Thanks!

if (path != null) {
yield return path;
}
}
}

Expand Down