opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.13'

Browse Source 
* stable-2.13:
  InMemoryRepositoryManager: Increment repository use count
  InMemoryTestingDatabaseModule: Bind InMemoryRepositoryManager as Singleton
  Update git submodules

Change-Id: Ie7a6bf7d03a7a8898e88aee4b555567dc67e25a7
This commit is contained in:
David Pursehouse
2017-02-03 11:03:43 +09:00
parent cbad27c464 d545c2970b
commit 36a442aa87
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/InMemoryTestingDatabaseModule.java
View File

@@ -79,7 +79,8 @@ class InMemoryTestingDatabaseModule extends LifecycleModule {
makeSiteDirs(p); makeSiteDirs(p);
bind(GitRepositoryManager.class) bind(GitRepositoryManager.class)
.toInstance(new InMemoryRepositoryManager()); .to(InMemoryRepositoryManager.class);
bind(InMemoryRepositoryManager.class).in(SINGLETON);
bind(MetricMaker.class).to(DisabledMetricMaker.class); bind(MetricMaker.class).to(DisabledMetricMaker.class);
bind(DataSourceType.class).to(InMemoryH2Type.class); bind(DataSourceType.class).to(InMemoryH2Type.class);

1
gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryRepositoryManager.java
View File

@@ -115,6 +115,7 @@ public class InMemoryRepositoryManager implements GitRepositoryManager {
throws RepositoryNotFoundException { throws RepositoryNotFoundException {
Repo repo = repos.get(normalize(name)); Repo repo = repos.get(normalize(name));
if (repo != null) { if (repo != null) {
repo.incrementOpen();
return repo; return repo;
} }
throw new RepositoryNotFoundException(name.get()); throw new RepositoryNotFoundException(name.get());