Merge branch 'stable-3.6' into stable-3.7 * stable-3.6: Give execute permission to entrypoint.sh Remove unused env variables Return empty list when prefix is not matched in suggest Expose debug ports in Gerrit Do no update Gerrit rpm Remove /a from fetch url in replication.config.template Allow anonymous clones when pull-replication plugin is enabled. Also update the Gerrit version to 3.7.0 in Dockerfile Change-Id: I2cefdb0d94de2375e70eca3e34fd7adf117fbe32
diff --git a/example-setup/Dockerfile b/example-setup/Dockerfile index fea2ac9..350aec0 100644 --- a/example-setup/Dockerfile +++ b/example-setup/Dockerfile
@@ -1,4 +1,4 @@ -FROM gerritcodereview/gerrit:3.6.3-almalinux8 +FROM gerritcodereview/gerrit:3.7.0-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 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);