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