Skip to content
Snippets Groups Projects
Commit d8056995 authored by Robin Rosenberg's avatar Robin Rosenberg Committed by Shawn O. Pearce
Browse files

Don't crash if we try to load the config for a MockSystemReader


Instead do nothing.  For now, save() will fail and the config
file is set to null, which may surprise some calling tests.

Change-Id: I1c65f8b1131569da01b4ef33678d813565521fbb
Signed-off-by: default avatarRobin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
parent 53f3632f
No related branches found
No related tags found
No related merge requests found
/*
* Copyright (C) 2009, Google Inc.
* Copyright (C) 2009, Robin Rosenberg <robin.rosenberg@dewire.com>
* Copyright (C) 2009, Yann Simon <yann.simon.fr@gmail.com>
* and other copyright owners as documented in the project's IP log.
*
......@@ -44,10 +45,12 @@
package org.eclipse.jgit.junit;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.TimeZone;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.FileBasedConfig;
import org.eclipse.jgit.util.SystemReader;
......@@ -63,7 +66,11 @@ public MockSystemReader() {
init(Constants.GIT_AUTHOR_EMAIL_KEY);
init(Constants.GIT_COMMITTER_NAME_KEY);
init(Constants.GIT_COMMITTER_EMAIL_KEY);
userGitConfig = new FileBasedConfig(null);
userGitConfig = new FileBasedConfig(null) {
@Override
public void load() throws IOException, ConfigInvalidException {
// Do nothing
}};
}
private void init(final String n) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment