Merge branch 'stable-4.6'

* stable-4.6:
  Don't remove pack when FileNotFoundException is transient

Change-Id: I82941a98385cda27c89e1e6750b7b6db4e39f414
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --cc org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java
index 1aa71e5a59455ffe25631b251a22a858145218f7,6489415ebbb3082d1f49ff0bd8db835a9df715c0..00e39533b10c7bb86406a30f5be751ba12357167
--- 1/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
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java
@@@ -576,14 -568,17 +582,17 @@@ public class ObjectDirectory extends Fi
                        removePack(p);
                } else if (e instanceof FileNotFoundException) {
                        if (p.getPackFile().exists()) {
-                               warnTmpl = JGitText.get().packInaccessible;
+                               errTmpl = JGitText.get().packInaccessible;
+                               transientErrorCount = p.incrementTransientErrorCount();
                        } else {
                                warnTmpl = JGitText.get().packWasDeleted;
+                               removePack(p);
                        }
-                       removePack(p);
 -              } else if (FileUtils.isStaleFileHandle(e)) {
 +              } else if (FileUtils.isStaleFileHandleInCausalChain(e)) {
                        warnTmpl = JGitText.get().packHandleIsStale;
                        removePack(p);
+               } else {
+                       transientErrorCount = p.incrementTransientErrorCount();
                }
                if (warnTmpl != null) {
                        if (LOG.isDebugEnabled()) {

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java
Simple merge