From d80569955ed4b38732aeb3dc88ffa99243002448 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Mon, 14 Dec 2009 09:06:22 +0100 Subject: [PATCH] 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: Robin Rosenberg Signed-off-by: Shawn O. Pearce --- .../src/org/eclipse/jgit/junit/MockSystemReader.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java index 87125d280..306d432e6 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2009, Google Inc. + * Copyright (C) 2009, Robin Rosenberg * Copyright (C) 2009, Yann Simon * 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) {