Integrating up through commit 90f050496

This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
@@ -234,16 +234,4 @@ namespace AWSMetrics
return true;
}
bool MetricsQueue::ReadFromString(const AZStd::string& string)
{
auto result = AzFramework::FileFunc::ReadJsonFromString(string);
if (!result.IsSuccess() || !ReadFromJsonDocument(result.GetValue()))
{
AZ_Error("AWSMetrics", false, "The provided JSON string is invalid.");
return false;
}
return true;
}
}