h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-19 06:32:55 +08:00
Code Issues Releases Wiki Activity

Merge pull request #14045 from peppy/avoid-unnecessary-error-deserialisation

Browse Source 
Avoid deserialisation JSON request content when error is not present (or not relevant)
This commit is contained in:
Dan Balasescu 2021-07-28 20:58:46 +09:00 committed by GitHub
commit 5144bf8354
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
osu.Game/Online/API/APIRequest.cs
View File

@ -171,19 +171,24 @@ namespace osu.Game.Online.API
WebRequest?.Abort(); WebRequest?.Abort();
string responseString = WebRequest?.GetResponseString(); // in the case of a cancellation we don't care about whether there's an error in the response.
if (!(e is OperationCanceledException))
if (!string.IsNullOrEmpty(responseString))
{ {
try string responseString = WebRequest?.GetResponseString();
{
// attempt to decode a displayable error string. // naive check whether there's an error in the response to avoid unnecessary JSON deserialisation.
var error = JsonConvert.DeserializeObject<DisplayableError>(responseString); if (!string.IsNullOrEmpty(responseString) && responseString.Contains(@"""error"""))
if (error != null)
e = new APIException(error.ErrorMessage, e);
}
catch
{ {
try
{
// attempt to decode a displayable error string.
var error = JsonConvert.DeserializeObject<DisplayableError>(responseString);
if (error != null)
e = new APIException(error.ErrorMessage, e);
}
catch
{
}
} }
} }