Merge branch 'stable-3.6' into stable-3.7 * stable-3.6: Remove unused Java class InitProjectException Invoke the service method when using ProjectInitializationAction Add missing local JGit fetch test assertion Fix typo in test names Do not rely on async/wait for synchronous fetch replication Make sure that the EventListener receives replication events Add mirror replication option for JGit client Remove unnecessary checked exception Cover the replication failure scenario and fix the metrics Remove white-box unit tests on synchronous FetchCommand Throw Exception from tests Change-Id: I91fd3967d0c17eb5645b0531bb6986478ad3b8e2
diff --git a/example-setup/broker/Dockerfile b/example-setup/broker/Dockerfile index b79470c..67eecd9 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
diff --git a/example-setup/http/Dockerfile b/example-setup/http/Dockerfile index 77fed72..afadb4f 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
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 5a4393c..6b903d8 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
@@ -155,7 +155,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);