Skip to content

net46 sets WebException as OriginalException where netcore sets Elast… #3302

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 2 commits into from
Jun 25, 2018
Merged

net46 sets WebException as OriginalException where netcore sets Elast… #3302

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a671c6
net46 sets WebException as OriginalException where netcore sets Elast…
Mpdreamz Jun 22, 2018
1da0404
Add pragma to using statement
codebrain Jun 24, 2018
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
19 changes: 17 additions & 2 deletions src/Elasticsearch.Net/Transport/Transport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Threading;
using System;
using System.Linq;
using System.Net;
Copy link
Member Author

@Mpdreamz Mpdreamz Jun 22, 2018

Choose a reason for hiding this comment

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

pragma as well


namespace Elasticsearch.Net
{
Expand Down Expand Up @@ -190,8 +191,22 @@ private static IApiCallDetails GetMostRecentCallDetails<TResponse>(TResponse res

private void HandleElasticsearchClientException(RequestData data, Exception clientException, IElasticsearchResponse response)
{
if (clientException != null && response.ApiCall.OriginalException == null && response.ApiCall is ApiCallDetails a)
a.OriginalException = clientException;
if (response.ApiCall is ApiCallDetails a)
{
//if original exception was not explicitly set during the pipeline
//set it to the ElasticsearchClientException we created for the bad response
if (clientException != null && a.OriginalException == null)
a.OriginalException = clientException;
//On .NET Core the IConnection implementation throws exceptions on bad responses
//This causes it to behave differently to .NET FULL. We already wrapped the WebExeption
//under ElasticsearchServerException and it exposes way more information as part of it's
//exception message e.g the the root cause of the server error body.
#if FEATURE_HTTPWEBREQUEST
if (a.OriginalException is WebException)
a.OriginalException = clientException;
#endif
}

this.Settings.OnRequestCompleted?.Invoke(response.ApiCall);
if (clientException != null && data.ThrowExceptions) throw clientException;
}
Expand Down