motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Add public isStaleFileHandle() API, improve detection."

This commit is contained in:
Matthias Sohn 2015-08-26 16:16:28 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent b5941c74e5 cb08dd8b14
commit cc50ec2d87
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java
View File

@ -114,8 +114,6 @@ public class ObjectDirectory extends FileObjectDatabase {
/** Maximum number of candidates offered as resolutions of abbreviation. */ /** Maximum number of candidates offered as resolutions of abbreviation. */
private static final int RESOLVE_ABBREV_LIMIT = 256; private static final int RESOLVE_ABBREV_LIMIT = 256;
private static final String STALE_FILE_HANDLE_MSG = "stale file handle"; //$NON-NLS-1$
private final Config config; private final Config config;
private final File objects; private final File objects;
@ -565,8 +563,7 @@ private void handlePackError(IOException e, PackFile p) {
} else if (e instanceof FileNotFoundException) { } else if (e instanceof FileNotFoundException) {
warnTmpl = JGitText.get().packWasDeleted; warnTmpl = JGitText.get().packWasDeleted;
removePack(p); removePack(p);
} else if (e.getMessage() != null } else if (FileUtils.isStaleFileHandle(e)) {
&& e.getMessage().toLowerCase().contains(STALE_FILE_HANDLE_MSG)) {
warnTmpl = JGitText.get().packHandleIsStale; warnTmpl = JGitText.get().packHandleIsStale;
removePack(p); removePack(p);
} }

11
org.eclipse.jgit/src/org/eclipse/jgit/util/FileUtils.java
View File

@ -514,4 +514,15 @@ else if (!ignoreCase
} }
return builder.toString(); return builder.toString();
} }
/**
* Determine if an IOException is a Stale NFS File Handle
*
* @param ioe
* @return a boolean true if the IOException is a Stale NFS FIle Handle
*/
public static boolean isStaleFileHandle(IOException ioe) {
String msg = ioe.getMessage();
return msg != null && msg.toLowerCase().matches("stale .*file .*handle");
}
} }