[JGIT PATCH 5/5] Include the file path when FileBasedConfig.load throws an exception
- From
Shawn O. Pearce <spearce@spearce.org>
- Date
- Jul 29, 2009, 15:50 UTC
- Message-ID
- <1248882627-7285-6-git-send-email-spearce@spearce.org>
- In-Reply-To
- <1248882627-7285-5-git-send-email-spearce@spearce.org>
This may help an end-user debug the problem, if they know what file the error occurred in. We have to wrap the exception here because the methods throwing the original error do not have access to the file path, and cannot include it in the message.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org> --- .../src/org/spearce/jgit/lib/FileBasedConfig.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/FileBasedConfig.java b/org.spearce.jgit/src/org/spearce/jgit/lib/FileBasedConfig.java index adf85c6..518b31d 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/lib/FileBasedConfig.java +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/FileBasedConfig.java @@ -98,6 +98,12 @@ public void load() throws IOException, ConfigInvalidException { fromText(RawParseUtils.decode(NB.readFully(getFile()))); } catch (FileNotFoundException noFile) { clear(); + } catch (IOException e) { + final IOException e2 = new IOException("Cannot read " + getFile()); + e2.initCause(e); + throw e2; + } catch (ConfigInvalidException e) { + throw new ConfigInvalidException("Cannot read " + getFile(), e); } }
-- 1.6.4.rc3.201.gd9d59