opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.0' into stable-3.1

Browse Source 
* stable-3.0:
  config-project-config.txt: reformat submit-section
  TestSubmitType: Enable logErrors when debug logging is enabled
  TestSubmitRule: Enable logErrors when debug logging is enabled
  Fix typos in test.submit_rule and test.submit_type examples
  RestApiServlet: Log JSON parse error at debug level

The changes "Enable logErrors when debug logging is enabled" are
omitted by this merge due to refactoring done in the TestSubmitType
and TestSubmitRule classes. This will be redone in a follow-up.

Change-Id: I997bfed6fda28dd49c0cc13508b83114ff9c6266
This commit is contained in:
David Pursehouse
2020-06-18 18:13:59 +09:00
parent 9434da97a9 f5ef2dc2d3
commit 4df4f39b5a
3 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/com/google/gerrit/httpd/restapi/RestApiServlet.java
View File

@@ -591,6 +591,7 @@ public class RestApiServlet extends HttpServlet {
}
}
} catch (MalformedJsonException | JsonParseException e) {
logger.atFine().withCause(e).log("REST call failed on JSON parsing");
responseBytes =
replyError(
req, res, status = SC_BAD_REQUEST, "Invalid " + JSON_TYPE + " in request", e);