Merge "Merge branch 'stable-3.13' into stable-3.14" into stable-3.14

src/main/java/com/ericsson/gerrit/plugins/highavailability/index/ChangeCheckerImpl.java

diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/ChangeCheckerImpl.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/ChangeCheckerImpl.java
index 6156fb5..e4de705 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/ChangeCheckerImpl.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/ChangeCheckerImpl.java
@@ -102,7 +102,7 @@
           IndexEvent indexEvent = indexEventOption.get();
           return computedChangeTs.get().compareTo(indexEvent.eventCreatedOn) >= 0
               && (Objects.isNull(indexEvent.targetSha) || repositoryHas(repo, indexEvent.targetSha))
-              && (Objects.isNull(indexEvent.targetSha) || repositoryHas(repo, indexEvent.metaSha));
+              && (Objects.isNull(indexEvent.metaSha) || repositoryHas(repo, indexEvent.metaSha));
         }
       }
       return true;

src/test/docker/gerrit/Dockerfile

diff --git a/src/test/docker/gerrit/Dockerfile b/src/test/docker/gerrit/Dockerfile
index e655b84..3db728b 100644
--- a/src/test/docker/gerrit/Dockerfile
+++ b/src/test/docker/gerrit/Dockerfile
@@ -27,7 +27,7 @@
     /tmp/gerrit.war
 
 ADD --chown=gerrit \
-    "https://gerrit-ci.gerritforge.com/view/Plugins-master/job/plugin-javamelody-bazel-master-$GERRIT_BRANCH/lastSuccessfulBuild/artifact/bazel-bin/plugins/javamelody/javamelody.jar" \
+    "https://gerrit-ci.gerritforge.com/view/Plugins-master/job/plugin-javamelody-bazel-$GERRIT_BRANCH/lastSuccessfulBuild/artifact/bazel-bin/plugins/javamelody/javamelody.jar" \
     /var/gerrit/plugins/javamelody.jar
 
 ADD --chown=gerrit \