Merge branch 'stable-3.1'
* stable-3.1:
setup_local_env: Fix README markdown lint warnings
dockerised_local_env: Formalize slashes for git-ignored folders
Sort .gitignore files using LC_COLLATE=C like core
dockerised_local_env: Fix ssh private key permission
dockerised_local_env: Make gerrit-1 ssh host known
dockerised_local_env: Add replication.jar as a lib
dockerised_local_env: Add wget to README prerequisites
Change-Id: I71a4d2a7c3fb4ee6e88d67d27ff814606ede6f00
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;
}
}
