opendev/gerrit
Code Issues Proposed changes

Update to JGit 0.8.4.240-g8e9cc82

Browse Source 
Change-Id: Id43a1846b31bb1aad40ca0ae295a268fcacd162f
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2010-08-05 17:57:35 -07:00
parent 91c1532130
commit 5f11b2954c
26 changed files with 255 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigProvider.java
View File

@@ -20,7 +20,8 @@ import com.google.inject.ProvisionException;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.FileBasedConfig;
import org.eclipse.jgit.storage.file.FileBasedConfig;
import org.eclipse.jgit.util.FS;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,7 +41,7 @@ class GerritServerConfigProvider implements Provider<Config> {
@Override
public Config get() {
FileBasedConfig cfg = new FileBasedConfig(site.gerrit_config);
FileBasedConfig cfg = new FileBasedConfig(site.gerrit_config, FS.DETECTED);
if (!cfg.getFile().exists()) {
log.info("No " + site.gerrit_config.getAbsolutePath()
@@ -57,7 +58,7 @@ class GerritServerConfigProvider implements Provider<Config> {
}
if (site.secure_config.exists()) {
cfg = new FileBasedConfig(cfg, site.secure_config);
cfg = new FileBasedConfig(cfg, site.secure_config, FS.DETECTED);
try {
cfg.load();
} catch (IOException e) {