commit f99f69750b2d05734b24b5352cfff5ebc1de38dc
author Luca Milanesio <luca.milanesio@gmail.com> Thu Jan 05 00:29:56 2023 +0000
committer Luca Milanesio <luca.milanesio@gmail.com> Thu Jan 05 00:30:01 2023 +0000
tree 2c98b77235ecd5479a822e24d3d97282b3475380
parent 5146a711bfe4cbc133793237b619b316f5961de1
parent 57909c6977bf3960156e6335ca239b142c7be788

Merge branch 'stable-3.7'

* stable-3.7:
  Return BAD_REQUEST when the REST API throws IllegalArgumentException

Change-Id: I20f022beaaa0db32837d6da6f643675f2f416fe5

src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/PullReplicationFilter.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/PullReplicationFilter.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/PullReplicationFilter.java
index 20122a7..7027239 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/PullReplicationFilter.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/PullReplicationFilter.java
@@ -140,7 +140,7 @@
     } catch (AuthException e) {
       RestApiServlet.replyError(
           httpRequest, httpResponse, SC_FORBIDDEN, e.getMessage(), e.caching(), e);
-    } catch (MalformedJsonException | JsonParseException e) {
+    } catch (MalformedJsonException | JsonParseException | IllegalArgumentException e) {
       logger.atFine().withCause(e).log("REST call failed on JSON parsing");
       RestApiServlet.replyError(
           httpRequest, httpResponse, SC_BAD_REQUEST, "Invalid json in request", e);