Merge branch 'stable-5.1' into stable-5.2
* stable-5.1: Revert "RefDirectory.scanRef: Re-use file existence check done in snapshot creation" Change-Id: I625667c2718ab31ae7df907c3dd6024a933913b8 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
This commit is contained in:
commit
f2d4783c52
|
@ -439,15 +439,6 @@ public boolean equals(Object obj) {
|
|||
return equals(other);
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if the file exists
|
||||
*
|
||||
* @return true if the file exists
|
||||
*/
|
||||
public boolean fileExists() {
|
||||
return !MISSING_FILEKEY.equals(this.fileKey);
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
@Override
|
||||
public int hashCode() {
|
||||
|
|
|
@ -1103,10 +1103,6 @@ LooseRef scanRef(LooseRef ref, String name) throws IOException {
|
|||
final int limit = 4096;
|
||||
final byte[] buf;
|
||||
FileSnapshot otherSnapshot = FileSnapshot.save(path);
|
||||
if (!otherSnapshot.fileExists()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
buf = IO.readSome(path, limit);
|
||||
} catch (FileNotFoundException noFile) {
|
||||
|
|
Loading…
Reference in New Issue