From 974dda67f9c4282d6d94af4b2c71e08e26534ab1 Mon Sep 17 00:00:00 2001 From: Makson Lee Date: Wed, 19 Oct 2016 05:36:21 +0000 Subject: Make SearchingChangeCacheImpl nullable when replicating from slave SearchingChangeCacheImpl should be nullable in slave mode. Change-Id: If22407565f44e7ed201e57d7d3b7b9a51f20b5bc --- src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java b/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java index 48586eb..a251832 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java @@ -21,6 +21,7 @@ import com.google.common.base.Throwables; import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; +import com.google.gerrit.common.Nullable; import com.google.gerrit.extensions.events.GitReferenceUpdatedListener; import com.google.gerrit.metrics.Timer1; import com.google.gerrit.reviewdb.client.Project; @@ -128,7 +129,7 @@ class PushOne implements ProjectRunnable, CanceledWhileRunning { TagCache tc, PerThreadRequestScope.Scoper ts, ChangeNotes.Factory nf, - SearchingChangeCacheImpl cc, + @Nullable SearchingChangeCacheImpl cc, ReplicationQueue rq, IdGenerator ig, ReplicationStateListener sl, -- cgit v1.2.3