Merge "Protocol V2: respect MAX_HAVES only once we got at least one ACK"
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java
index 54ff7d2..7b4406a 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java
@@ -12,8 +12,10 @@
import static org.eclipse.jgit.util.FS.FileStoreAttributes.FALLBACK_FILESTORE_ATTRIBUTES;
import static org.eclipse.jgit.util.FS.FileStoreAttributes.FALLBACK_TIMESTAMP_RESOLUTION;
+
import java.io.File;
import java.io.IOException;
+import java.nio.file.NoSuchFileException;
import java.nio.file.attribute.BasicFileAttributes;
import java.time.Duration;
import java.time.Instant;
@@ -226,9 +228,15 @@
BasicFileAttributes fileAttributes = null;
try {
fileAttributes = FS.DETECTED.fileAttributes(file);
+ } catch (NoSuchFileException e) {
+ this.lastModified = Instant.EPOCH;
+ this.size = 0L;
+ this.fileKey = MISSING_FILEKEY;
+ return;
} catch (IOException e) {
- this.lastModified = Instant.ofEpochMilli(file.lastModified());
- this.size = file.length();
+ LOG.error(e.getMessage(), e);
+ this.lastModified = Instant.EPOCH;
+ this.size = 0L;
this.fileKey = MISSING_FILEKEY;
return;
}
@@ -309,9 +317,14 @@
currLastModified = fileAttributes.lastModifiedTime().toInstant();
currSize = fileAttributes.size();
currFileKey = getFileKey(fileAttributes);
+ } catch (NoSuchFileException e) {
+ currLastModified = Instant.EPOCH;
+ currSize = 0L;
+ currFileKey = MISSING_FILEKEY;
} catch (IOException e) {
- currLastModified = Instant.ofEpochMilli(path.lastModified());
- currSize = path.length();
+ LOG.error(e.getMessage(), e);
+ currLastModified = Instant.EPOCH;
+ currSize = 0L;
currFileKey = MISSING_FILEKEY;
}
sizeChanged = isSizeChanged(currSize);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryCache.java
index c1beb6f..41f291b 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryCache.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryCache.java
@@ -202,7 +202,7 @@
private volatile long expireAfter;
- private Object schedulerLock = new Lock();
+ private final Object schedulerLock = new Lock();
private RepositoryCache() {
cacheMap = new ConcurrentHashMap<>();
