summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMakson Lee <cdlee123@gmail.com>2016-10-19 05:36:21 +0000
committerDavid Pursehouse <dpursehouse@collab.net>2016-10-19 15:06:16 +0900
commit974dda67f9c4282d6d94af4b2c71e08e26534ab1 (patch)
tree75d1e49447100069390278f7397377fc25474ce3
parentc5123d6a5604cc740d6f42485235c0d3ec141c4e (diff)
Make SearchingChangeCacheImpl nullable when replicating from slavev2.13.5v2.13.4v2.13.3v2.13.2
SearchingChangeCacheImpl should be nullable in slave mode. Change-Id: If22407565f44e7ed201e57d7d3b7b9a51f20b5bc
-rw-r--r--src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java3
1 files changed, 2 insertions, 1 deletions
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,