Skip to content

Add catch for JsonException in GetBodyContent. #4596

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

Merged
merged 1 commit into from
Sep 4, 2020
Merged

Add catch for JsonException in GetBodyContent. #4596

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: 9 additions & 1 deletion ...aries/integration/Microsoft.Bot.Builder.Integration.AspNet.Core/BotFrameworkHttpClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,15 @@ protected virtual async Task<AppCredentials> BuildCredentialsAsync(string appId,

private static T GetBodyContent<T>(string content)
{
return JsonConvert.DeserializeObject<T>(content);
try
{
return JsonConvert.DeserializeObject<T>(content);
}
catch (JsonException)
{
// This will only happen when the skill didn't return valid json in the content (e.g. when the status code is 500 or there's a bug in the skill)
return default;
}
}

private async Task<InvokeResponse<T>> SecurePostActivityAsync<T>(Uri toUrl, Activity activity, string token, CancellationToken cancellationToken)
Expand Down