opendev/gerrit
Code Issues Proposed changes

InMemoryModule: Use ReplicaUtil.isReplica

Browse Source 
Change-Id: Iad5bb2bef1537c6404fafa22e8bb829ba9241161
This commit is contained in:
David Pursehouse
2019-10-18 09:55:47 +09:00
parent 7595da0cdf
commit 9332bb1e2a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/com/google/gerrit/testing/InMemoryModule.java
View File

@@ -86,6 +86,7 @@ import com.google.gerrit.server.securestore.DefaultSecureStore;
import com.google.gerrit.server.securestore.SecureStore; import com.google.gerrit.server.securestore.SecureStore;
import com.google.gerrit.server.ssh.NoSshKeyCache; import com.google.gerrit.server.ssh.NoSshKeyCache;
import com.google.gerrit.server.submit.LocalMergeSuperSetComputation; import com.google.gerrit.server.submit.LocalMergeSuperSetComputation;
import com.google.gerrit.server.util.ReplicaUtil;
import com.google.inject.AbstractModule; import com.google.inject.AbstractModule;
import com.google.inject.Guice; import com.google.inject.Guice;
import com.google.inject.Injector; import com.google.inject.Injector;
@@ -299,11 +300,10 @@ public class InMemoryModule extends FactoryModule {
private Module indexModule(String moduleClassName) { private Module indexModule(String moduleClassName) {
try { try {
boolean slave = cfg.getBoolean("container", "replica", false);
Class<?> clazz = Class.forName(moduleClassName); Class<?> clazz = Class.forName(moduleClassName);
Method m = Method m =
clazz.getMethod("singleVersionWithExplicitVersions", Map.class, int.class, boolean.class); clazz.getMethod("singleVersionWithExplicitVersions", Map.class, int.class, boolean.class);
return (Module) m.invoke(null, getSingleSchemaVersions(), 0, slave); return (Module) m.invoke(null, getSingleSchemaVersions(), 0, ReplicaUtil.isReplica(cfg));
} catch (ClassNotFoundException } catch (ClassNotFoundException
| SecurityException | SecurityException
| NoSuchMethodException | NoSuchMethodException