| commit | 1215eeddd70786600b1835818ce7a7c3f4916890 | [log] [tgz] |
|---|---|---|
| author | Marco Miller <marco.miller@ericsson.com> | Tue Mar 31 11:39:35 2020 -0400 |
| committer | Marco Miller <marco.miller@ericsson.com> | Tue Mar 31 11:39:35 2020 -0400 |
| tree | 473ce845eacdb85e38e93984ca9873c2abda17f9 | |
| parent | b01c94f0d07d86f08f11f70cb944e351028d5425 [diff] | |
| parent | 5ebd191b76cca5d947c79c92076ea6fafa5baa79 [diff] |
Merge branch 'stable-3.1' * stable-3.1: e2e-tests: Introduce a CloneUsingMultiGerrit1 scenario Adapt setup to the new Zookeeper plugin name (zookeeper-refdb) Change-Id: I879728c678823a73c92f806045892198460d3948
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/index/ChangeCheckerImpl.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/index/ChangeCheckerImpl.java index 32b8af3..15b1e09 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/multisite/index/ChangeCheckerImpl.java +++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/index/ChangeCheckerImpl.java
@@ -79,7 +79,7 @@ @Override public Optional<ChangeNotes> getChangeNotes() { try (ManualRequestContext ctx = oneOffReqCtx.open()) { - this.changeNotes = Optional.ofNullable(changeFinder.findOne(changeId)); + this.changeNotes = changeFinder.findOne(changeId); return changeNotes; } }