Skip to content

Bug/8 resolve java service deadlock #9

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
zsrdjan wants to merge 1 commit into from
Closed

Bug/8 resolve java service deadlock #9

Show file tree
Hide file tree
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
10 changes: 8 additions & 2 deletions src/Server/Services/JavaService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,17 @@ public async Task<JavaInfoResult> GetJavaInfoAsync(CancellationToken cancellatio
return new JavaInfoResult(IsAvailable: false, properties);
}

string stdout = await process.StandardOutput.ReadToEndAsync(cancellationToken);
string stderr = await process.StandardError.ReadToEndAsync(cancellationToken);
// Read both streams concurrently to avoid deadlock
Task<string> stdoutTask = process.StandardOutput.ReadToEndAsync(cancellationToken);
Task<string> stderrTask = process.StandardError.ReadToEndAsync(cancellationToken);

try
{
// Wait for both reads to complete
await Task.WhenAll(stdoutTask, stderrTask);
string stdout = await stdoutTask;
string stderr = await stderrTask;

await process.WaitForExitAsync(cancellationToken);

string allOutput = stdout + Environment.NewLine + stderr;
Expand Down
14 changes: 10 additions & 4 deletions src/Server/Services/MustangCliService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,17 @@ private async Task<MustangCliResult> ExecuteAsync(string action, string[] additi
return MustangCliResult.Failed($"Failed to start Java process with Mustang CLI (action: {action}).");
}

string stdout = await process.StandardOutput.ReadToEndAsync(cancellationToken);
string stderr = await process.StandardError.ReadToEndAsync(cancellationToken);
// Read both streams concurrently to avoid deadlock
Task<string> stdoutTask = process.StandardOutput.ReadToEndAsync(cancellationToken);
Task<string> stderrTask = process.StandardError.ReadToEndAsync(cancellationToken);

try
{
// Wait for both reads to complete
await Task.WhenAll(stdoutTask, stderrTask);
string stdout = await stdoutTask;
string stderr = await stderrTask;

await process.WaitForExitAsync(cancellationToken);

return new MustangCliResult
Expand All @@ -130,8 +136,8 @@ private async Task<MustangCliResult> ExecuteAsync(string action, string[] additi
return new MustangCliResult
{
ExitCode = (int)ErrorCode.ProcessingTimeout,
StandardOutput = stdout,
StandardError = stderr
StandardOutput = string.Empty,
StandardError = string.Empty
};
}
}
Expand Down
Loading