Browse Source

Merge branch 'stable-5.2' into stable-5.3

* stable-5.2:
  ObjectDirectory: extra logging on packfile exceptions

Change-Id: I4bbeb1d28ab042e3c6c74f7284f5d882ed034305
stable-5.3
David Pursehouse 6 years ago
parent
commit
9d02e52406
  1. 2
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java

2
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java

@ -359,6 +359,7 @@ public class ObjectDirectory extends FileObjectDatabase {
// The hasObject call should have only touched the index, // The hasObject call should have only touched the index,
// so any failure here indicates the index is unreadable // so any failure here indicates the index is unreadable
// by this process, and the pack is likewise not readable. // by this process, and the pack is likewise not readable.
LOG.warn("Unable to read packfile " + p.getPackFile(), e);
removePack(p); removePack(p);
} }
} }
@ -651,6 +652,7 @@ public class ObjectDirectory extends FileObjectDatabase {
if ((e instanceof CorruptObjectException) if ((e instanceof CorruptObjectException)
|| (e instanceof PackInvalidException)) { || (e instanceof PackInvalidException)) {
warnTmpl = JGitText.get().corruptPack; warnTmpl = JGitText.get().corruptPack;
LOG.warn("Packfile " + p.getPackFile() + " is corrupted", e);
// Assume the pack is corrupted, and remove it from the list. // Assume the pack is corrupted, and remove it from the list.
removePack(p); removePack(p);
} else if (e instanceof FileNotFoundException) { } else if (e instanceof FileNotFoundException) {

Loading…
Cancel
Save