| commit | 8f71cb0d79d19f002da05a2186ea4ff7b5df0367 | [log] [tgz] |
|---|---|---|
| author | Marco Miller <marco.miller@ericsson.com> | Tue Apr 14 14:33:21 2020 -0400 |
| committer | Marco Miller <marco.miller@ericsson.com> | Tue Apr 14 14:33:21 2020 -0400 |
| tree | 49c93c9b6365faee6abb9efd6409f80921f86277 | |
| parent | f3290e296379e0857a1c6cc56769d1af17aad5a3 [diff] | |
| parent | 42e982b36eb1d03c74ef614f317b0a427a6002aa [diff] |
Merge branch 'stable-3.1' * stable-3.1: Force indexing of the ascync pending account events e2e-tests: Make CloneUsingMultiGerrit1 name unique e2e-tests: Add the CreateProjectUsingMultiGerritTwice scenario e2e-tests: Fix CloneUsingMultiGerrit1 seconds unit Change-Id: I5b0cc187ae2bb4b7e9b5805ff0ecc3566458615a
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; } }