Merge "Files should be deleted with "retry" option"
This commit is contained in:
commit
a6828b9b73
|
@ -557,11 +557,11 @@ InsertLooseObjectResult insertUnpackedObject(File tmp, ObjectId id,
|
||||||
// If the object is already in the repository, remove temporary file.
|
// If the object is already in the repository, remove temporary file.
|
||||||
//
|
//
|
||||||
if (unpackedObjectCache.isUnpacked(id)) {
|
if (unpackedObjectCache.isUnpacked(id)) {
|
||||||
FileUtils.delete(tmp);
|
FileUtils.delete(tmp, FileUtils.RETRY);
|
||||||
return InsertLooseObjectResult.EXISTS_LOOSE;
|
return InsertLooseObjectResult.EXISTS_LOOSE;
|
||||||
}
|
}
|
||||||
if (!createDuplicate && has(id)) {
|
if (!createDuplicate && has(id)) {
|
||||||
FileUtils.delete(tmp);
|
FileUtils.delete(tmp, FileUtils.RETRY);
|
||||||
return InsertLooseObjectResult.EXISTS_PACKED;
|
return InsertLooseObjectResult.EXISTS_PACKED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -571,7 +571,7 @@ InsertLooseObjectResult insertUnpackedObject(File tmp, ObjectId id,
|
||||||
// that already exists. We can't be sure renameTo() would
|
// that already exists. We can't be sure renameTo() would
|
||||||
// fail on all platforms if dst exists, so we check first.
|
// fail on all platforms if dst exists, so we check first.
|
||||||
//
|
//
|
||||||
FileUtils.delete(tmp);
|
FileUtils.delete(tmp, FileUtils.RETRY);
|
||||||
return InsertLooseObjectResult.EXISTS_LOOSE;
|
return InsertLooseObjectResult.EXISTS_LOOSE;
|
||||||
}
|
}
|
||||||
if (tmp.renameTo(dst)) {
|
if (tmp.renameTo(dst)) {
|
||||||
|
@ -592,7 +592,7 @@ InsertLooseObjectResult insertUnpackedObject(File tmp, ObjectId id,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!createDuplicate && has(id)) {
|
if (!createDuplicate && has(id)) {
|
||||||
FileUtils.delete(tmp);
|
FileUtils.delete(tmp, FileUtils.RETRY);
|
||||||
return InsertLooseObjectResult.EXISTS_PACKED;
|
return InsertLooseObjectResult.EXISTS_PACKED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -601,7 +601,7 @@ InsertLooseObjectResult insertUnpackedObject(File tmp, ObjectId id,
|
||||||
// either. We really don't know what went wrong, so
|
// either. We really don't know what went wrong, so
|
||||||
// fail.
|
// fail.
|
||||||
//
|
//
|
||||||
FileUtils.delete(tmp);
|
FileUtils.delete(tmp, FileUtils.RETRY);
|
||||||
return InsertLooseObjectResult.FAILURE;
|
return InsertLooseObjectResult.FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -182,7 +182,7 @@ private File toTemp(final MessageDigest md, final int type, long len,
|
||||||
return tmp;
|
return tmp;
|
||||||
} finally {
|
} finally {
|
||||||
if (delete)
|
if (delete)
|
||||||
FileUtils.delete(tmp);
|
FileUtils.delete(tmp, FileUtils.RETRY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -211,7 +211,7 @@ private File toTemp(final int type, final byte[] buf, final int pos,
|
||||||
return tmp;
|
return tmp;
|
||||||
} finally {
|
} finally {
|
||||||
if (delete)
|
if (delete)
|
||||||
FileUtils.delete(tmp);
|
FileUtils.delete(tmp, FileUtils.RETRY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue