Merge master (1.7.2) into develop (1.8.0-b2)

This commit is contained in:
manojsdoshi
2021-05-26 14:05:55 -07:00
16 changed files with 595 additions and 90 deletions

View File

@@ -903,6 +903,17 @@ ServerHandlerImp::processRequest(
reply.append(std::move(r));
else
reply = std::move(r);
if (reply.isMember(jss::result) &&
reply[jss::result].isMember(jss::result))
{
reply = reply[jss::result];
if (reply.isMember(jss::status))
{
reply[jss::result][jss::status] = reply[jss::status];
reply.removeMember(jss::status);
}
}
}
auto response = to_string(reply);