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.

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

Jump to bottom

Item Operations: Fixes JsonSerialization exception when MissingMemberHandling = Error on Json default settings when NotFound on Item operations. #4125

Merged
merged 9 commits into from
Oct 18, 2023
Merged

Item Operations: Fixes JsonSerialization exception when MissingMemberHandling = Error on Json default settings when NotFound on Item operations. #4125

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
065efc7
issue 4115 initial checkin. need insight from issuer on reproducing t…
philipthomas-MSFT Oct 14, 2023
048e019
test refactoring and adding more coverage for other NotFound scenarios
philipthomas-MSFT Oct 17, 2023
e06da21
commit on some actionables
philipthomas-MSFT Oct 17, 2023
0390f2a
Merge branch 'master' into 4115-cosmos-sdk-v3-throws-a-serialization-…
philipthomas-MSFT Oct 17, 2023
6192173
setting JsonConvert.DefaultSettings to null so that other tests will …
philipthomas-MSFT Oct 18, 2023
3c055a9
Merge branch '4115-cosmos-sdk-v3-throws-a-serialization-exception-ins…
philipthomas-MSFT Oct 18, 2023
145e65d
Merge branch 'master' into 4115-cosmos-sdk-v3-throws-a-serialization-…
philipthomas-MSFT Oct 18, 2023
1bed577
as requested, removed catches from test methods
philipthomas-MSFT Oct 18, 2023
affc1a0
Merge branch 'master' into 4115-cosmos-sdk-v3-throws-a-serialization-…
philipthomas-MSFT Oct 18, 2023
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
9 changes: 8 additions & 1 deletion Microsoft.Azure.Cosmos/src/Resource/CosmosExceptions/CosmosExceptionFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ internal static (Error, string) GetErrorFromStream(
using (StreamReader streamReader = new StreamReader(content))
{
string errorContent = streamReader.ReadToEnd();

try
{
JObject errorObj = JObject.Parse(errorContent);
Expand All @@ -179,7 +180,7 @@ internal static (Error, string) GetErrorFromStream(
return (error, message.ToString());
}
}
catch (Newtonsoft.Json.JsonReaderException)
catch (Exception exception) when (CosmosExceptionFactory.ExceptionsToIgnore(exception))
philipthomas-MSFT marked this conversation as resolved.
Show resolved Hide resolved
{
}

Expand All @@ -193,6 +194,12 @@ internal static (Error, string) GetErrorFromStream(
}
}

private static bool ExceptionsToIgnore(Exception exception)
{
return exception is Newtonsoft.Json.JsonReaderException ||
exception is Newtonsoft.Json.JsonSerializationException;
}

internal static CosmosException CreateRequestTimeoutException(
string message,
Headers headers,
Expand Down
Loading
Loading