commit 231a0a1e0ccce072f336e81a003372db295c4ab4
author Christopher Miliotis <christoforos.miliotis.dev@gmail.com> Thu Mar 30 13:53:14 2023 +0100
committer Christopher Miliotis <christoforos.miliotis.dev@gmail.com> Thu Mar 30 13:53:14 2023 +0100
tree 44c3c8141ab851dda96f1f3b0f041f48e157aab2
parent a3d32102f13846565ec5d4bbad276b672638afbd
parent 7497c409c4dd5f321de21b9a96e5cdc49ef71ecd

Merge branch 'stable-3.6' into stable-3.7

* stable-3.6:
  Update gitignore

Change-Id: I693d9e2ea014a5d82dcc5af1889bab5c1a112857

example-setup/broker/Dockerfile

diff --git a/example-setup/broker/Dockerfile b/example-setup/broker/Dockerfile
index 566e839..acc34b9 100644
--- a/example-setup/broker/Dockerfile
+++ b/example-setup/broker/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritcodereview/gerrit:3.6.3-almalinux8
+FROM gerritcodereview/gerrit:3.7.2-almalinux8
 
 USER root
 

example-setup/http/Dockerfile

diff --git a/example-setup/http/Dockerfile b/example-setup/http/Dockerfile
index b966b5f..3a68b59 100644
--- a/example-setup/http/Dockerfile
+++ b/example-setup/http/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritcodereview/gerrit:3.6.3-almalinux8
+FROM gerritcodereview/gerrit:3.7.2-almalinux8
 
 USER root
 

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);