opendev
/
gerrit
Code Issues Proposed changes

Merge branch 'stable-2.13' into stable-2.14 

* stable-2.13:
  Fix cyclic dependency when using site_path from system_config table

Change-Id: I519ee80c35190e1fe08d88522cbe64e464a44513
This commit is contained in:
David Pursehouse 2017-06-14 20:57:40 +09:00
parent 94ca426130 d0b688d3ad
commit b65c0af5ed
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-war/src/main/java/com/google/gerrit/httpd/SitePathFromSystemConfigProvider.java
View File

@ -17,6 +17,7 @@ package com.google.gerrit.httpd;
import com.google.gerrit.reviewdb.client.SystemConfig;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.config.SitePath;
import com.google.gerrit.server.schema.ReviewDbFactory;
import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Inject;
@ -30,7 +31,8 @@ class SitePathFromSystemConfigProvider implements Provider<Path> {
private final Path path;
@Inject
SitePathFromSystemConfigProvider(SchemaFactory<ReviewDb> schemaFactory) throws OrmException {
SitePathFromSystemConfigProvider(@ReviewDbFactory SchemaFactory<ReviewDb> schemaFactory)
throws OrmException {
path = read(schemaFactory);
}