From 363a3657b133ea4668bd832410eff67cfdb7dfd1 Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Fri, 24 Mar 2017 00:18:12 +0000 Subject: [PATCH] Don't flag a packfile invalid if opening existing file failed A packfile random file open operation may fail with a FileNotFoundException even if the file exists, possibly for the temporary lack of resources. Instead of managing the FileNotFoundException as any generic IOException it is best to rethrow the exception but prevent the packfile for being flagged as invalid until it is actually opened and read successfully or unsuccessfully. Bug: 514170 Change-Id: Ie37edba2df77052bceafc0b314fd1d487544bf35 Signed-off-by: Luca Milanesio Signed-off-by: Matthias Sohn --- .../org/eclipse/jgit/internal/storage/file/PackFile.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java index e004f9090..d33148152 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java @@ -50,6 +50,7 @@ import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX; import java.io.EOFException; import java.io.File; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InterruptedIOException; import java.io.RandomAccessFile; @@ -635,6 +636,12 @@ public class PackFile implements Iterable { // don't invalidate the pack, we are interrupted from another thread openFail(false); throw e; + } catch (FileNotFoundException fn) { + // don't invalidate the pack if opening an existing file failed + // since it may be related to a temporary lack of resources (e.g. + // max open files) + openFail(!packFile.exists()); + throw fn; } catch (IOException ioe) { openFail(true); throw ioe;